From 938040ae6b69bc099f8cd25e302bc5c499b57bf5 Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Thu, 19 Apr 2018 17:44:52 +0200 Subject: [PATCH 1/4] xDrip plugin depend filtering on source --- .../androidaps/plugins/Source/SourceXdripPlugin.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceXdripPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceXdripPlugin.java index 0d33f529b3..f47d25abb1 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceXdripPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceXdripPlugin.java @@ -12,6 +12,8 @@ import info.nightscout.androidaps.interfaces.PluginType; public class SourceXdripPlugin extends PluginBase implements BgSourceInterface { private static SourceXdripPlugin plugin = null; + + boolean advancedFiltering; public static SourceXdripPlugin getPlugin() { if (plugin == null) @@ -29,6 +31,10 @@ public class SourceXdripPlugin extends PluginBase implements BgSourceInterface { @Override public boolean advancedFilteringSupported() { - return false; + return advancedFiltering; + } + + public void setSource(String source) { + this.advancedFiltering = "G5 Native".equals(source); } } From a227a8b60133c622ca543c439d8fee48633cc54a Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Thu, 19 Apr 2018 17:45:52 +0200 Subject: [PATCH 2/4] Push source to xDrip plugin --- .../java/info/nightscout/androidaps/Services/DataService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/info/nightscout/androidaps/Services/DataService.java b/app/src/main/java/info/nightscout/androidaps/Services/DataService.java index 6a771fc4a1..a06b474cac 100644 --- a/app/src/main/java/info/nightscout/androidaps/Services/DataService.java +++ b/app/src/main/java/info/nightscout/androidaps/Services/DataService.java @@ -44,6 +44,7 @@ import info.nightscout.utils.BundleLogger; import info.nightscout.utils.JsonHelper; import info.nightscout.utils.NSUpload; import info.nightscout.utils.SP; +import info.nightscout.utils.ToastUtils; public class DataService extends IntentService { @@ -197,7 +198,8 @@ public class DataService extends IntentService { bgReading.direction = bundle.getString(Intents.EXTRA_BG_SLOPE_NAME); bgReading.date = bundle.getLong(Intents.EXTRA_TIMESTAMP); bgReading.raw = bundle.getDouble(Intents.EXTRA_RAW); - + String source = bundle.getString(Intents.XDRIP_DATA_SOURCE_DESCRIPTION, "no Source specified"); + SourceXdripPlugin.getPlugin().setSource(source); MainApp.getDbHelper().createIfNotExists(bgReading, "XDRIP"); } From 572b308f6cf6896873b001759df658dd23862d5d Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Thu, 19 Apr 2018 17:47:34 +0200 Subject: [PATCH 3/4] cleanup --- .../java/info/nightscout/androidaps/Services/DataService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/info/nightscout/androidaps/Services/DataService.java b/app/src/main/java/info/nightscout/androidaps/Services/DataService.java index a06b474cac..3e0bbf9c74 100644 --- a/app/src/main/java/info/nightscout/androidaps/Services/DataService.java +++ b/app/src/main/java/info/nightscout/androidaps/Services/DataService.java @@ -44,7 +44,6 @@ import info.nightscout.utils.BundleLogger; import info.nightscout.utils.JsonHelper; import info.nightscout.utils.NSUpload; import info.nightscout.utils.SP; -import info.nightscout.utils.ToastUtils; public class DataService extends IntentService { From eac6f15881e77d5bf4e8e06a73423d0f6d97a966 Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Thu, 19 Apr 2018 17:49:18 +0200 Subject: [PATCH 4/4] XDrip source description extra --- .../main/java/info/nightscout/androidaps/Services/Intents.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/info/nightscout/androidaps/Services/Intents.java b/app/src/main/java/info/nightscout/androidaps/Services/Intents.java index b9c90e905c..744530c8f2 100644 --- a/app/src/main/java/info/nightscout/androidaps/Services/Intents.java +++ b/app/src/main/java/info/nightscout/androidaps/Services/Intents.java @@ -37,6 +37,8 @@ public interface Intents { String EXTRA_SENSOR_BATTERY = "com.eveningoutpost.dexdrip.Extras.SensorBattery"; String EXTRA_TIMESTAMP = "com.eveningoutpost.dexdrip.Extras.Time"; String EXTRA_RAW = "com.eveningoutpost.dexdrip.Extras.Raw"; + String XDRIP_DATA_SOURCE_DESCRIPTION = "com.eveningoutpost.dexdrip.Extras.SourceDesc"; + String ACTION_NEW_BG_ESTIMATE_NO_DATA = "com.eveningoutpost.dexdrip.BgEstimateNoData";