From 1823371433e27db602eeafeca9d09a5a5b66bbfa Mon Sep 17 00:00:00 2001 From: James Woglom Date: Mon, 10 Sep 2018 11:56:33 -0400 Subject: [PATCH 1/2] update other "G5 Native" source reference for G6 --- .../androidaps/plugins/Source/SourceNSClientPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceNSClientPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceNSClientPlugin.java index 7470710d8c..de110edd4e 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceNSClientPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Source/SourceNSClientPlugin.java @@ -99,7 +99,7 @@ public class SourceNSClientPlugin extends PluginBase implements BgSourceInterfac public void detectSource(String source, long timeStamp) { if (timeStamp > lastBGTimeStamp) { - if (source.contains("G5 Native") || source.contains("AndroidAPS-DexcomG5")) + if (source.contains("G5 Native") || source.contains("G6 Native") || source.contains("AndroidAPS-DexcomG5")) isAdvancedFilteringEnabled = true; else isAdvancedFilteringEnabled = false; From 48c8863ccbd0cc765ee0005c139500ee89fe4140 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Tue, 11 Sep 2018 10:09:29 +0200 Subject: [PATCH 2/2] fix NPE --- .../plugins/Treatments/fragments/TreatmentsBolusFragment.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsBolusFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsBolusFragment.java index b825cc3fb8..b99ad97685 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsBolusFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsBolusFragment.java @@ -145,6 +145,8 @@ public class TreatmentsBolusFragment extends SubscriberFragment implements View. @Override public void onClick(View v) { final Treatment treatment = (Treatment) v.getTag(); + if (treatment == null) + return; switch (v.getId()) { case R.id.treatments_remove: AlertDialog.Builder builder = new AlertDialog.Builder(context);