caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Detect source from NSClient BG.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2018-06-23 01:28:49 +02:00
parent 906cc8a76a
commit 986d9fb01c
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceNSClientPlugin.java
View file

@ -19,6 +19,7 @@ import info.nightscout.androidaps.interfaces.PluginBase;
import info.nightscout.androidaps.interfaces.PluginDescription; import info.nightscout.androidaps.interfaces.PluginDescription;
import info.nightscout.androidaps.interfaces.PluginType; import info.nightscout.androidaps.interfaces.PluginType;
import info.nightscout.androidaps.plugins.NSClientInternal.data.NSSgv; import info.nightscout.androidaps.plugins.NSClientInternal.data.NSSgv;
import info.nightscout.utils.JsonHelper;
/** /**
* Created by mike on 05.08.2016. * Created by mike on 05.08.2016.
@ -65,7 +66,9 @@ public class SourceNSClientPlugin extends PluginBase implements BgSourceInterfac
for (int i = 0; i < jsonArray.length(); i++) { for (int i = 0; i < jsonArray.length(); i++) {
JSONObject sgvJson = jsonArray.getJSONObject(i); JSONObject sgvJson = jsonArray.getJSONObject(i);
BgReading bgReading = new BgReading(new NSSgv(sgvJson)); BgReading bgReading = new BgReading(new NSSgv(sgvJson));
bgReading.filtered = false; String sourceDescription = JsonHelper.safeGetString(sgvJson, "device");
bgReading.filtered = sourceDescription != null
&& (sourceDescription.equals("G5 Native") || sourceDescription.equals("AndroidAPS-DexcomG5"));
bgReading.sourcePlugin = getName(); bgReading.sourcePlugin = getName();
boolean isNew = MainApp.getDbHelper().createIfNotExists(bgReading, "NS"); boolean isNew = MainApp.getDbHelper().createIfNotExists(bgReading, "NS");
if (isNew) { if (isNew) {

3
app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceXdripPlugin.java
View file

@ -47,7 +47,8 @@ public class SourceXdripPlugin extends PluginBase implements BgSourceInterface {
bgReading.direction = bundle.getString(Intents.EXTRA_BG_SLOPE_NAME); bgReading.direction = bundle.getString(Intents.EXTRA_BG_SLOPE_NAME);
bgReading.date = bundle.getLong(Intents.EXTRA_TIMESTAMP); bgReading.date = bundle.getLong(Intents.EXTRA_TIMESTAMP);
bgReading.raw = bundle.getDouble(Intents.EXTRA_RAW); bgReading.raw = bundle.getDouble(Intents.EXTRA_RAW);
bgReading.filtered = Objects.equals(bundle.getString(Intents.XDRIP_DATA_SOURCE_DESCRIPTION), "G5 Native"); String sourceDescription = bundle.getString(Intents.XDRIP_DATA_SOURCE_DESCRIPTION, "");
bgReading.filtered = sourceDescription.equals("G5 Native") || sourceDescription.equals("AndroidAPS-DexcomG5");
bgReading.sourcePlugin = getName(); bgReading.sourcePlugin = getName();
boolean isNew = MainApp.getDbHelper().createIfNotExists(bgReading, getName()); boolean isNew = MainApp.getDbHelper().createIfNotExists(bgReading, getName());