From 2ce7ba3fc40db4a0d6eb747eeb8e8ecb1bf19fdd Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Sun, 1 Sep 2019 18:09:52 +0200 Subject: [PATCH 1/3] remove tidepool from plugin list --- app/src/main/java/info/nightscout/androidaps/MainApp.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.java b/app/src/main/java/info/nightscout/androidaps/MainApp.java index f2edd23882..3830376981 100644 --- a/app/src/main/java/info/nightscout/androidaps/MainApp.java +++ b/app/src/main/java/info/nightscout/androidaps/MainApp.java @@ -192,7 +192,8 @@ public class MainApp extends Application { if (Config.PUMPDRIVERS) pluginsList.add(LocalInsightPlugin.getPlugin()); pluginsList.add(CareportalPlugin.getPlugin()); if (Config.PUMPDRIVERS) pluginsList.add(ComboPlugin.getPlugin()); - if (Config.PUMPDRIVERS && engineeringMode) pluginsList.add(MedtronicPumpPlugin.getPlugin()); + if (Config.PUMPDRIVERS && engineeringMode) + pluginsList.add(MedtronicPumpPlugin.getPlugin()); if (Config.MDI) pluginsList.add(MDIPlugin.getPlugin()); pluginsList.add(VirtualPumpPlugin.getPlugin()); if (Config.APS) pluginsList.add(LoopPlugin.getPlugin()); @@ -223,8 +224,7 @@ public class MainApp extends Application { pluginsList.add(StatuslinePlugin.initPlugin(this)); pluginsList.add(PersistentNotificationPlugin.getPlugin()); pluginsList.add(NSClientPlugin.getPlugin()); - if (engineeringMode) - pluginsList.add(TidepoolPlugin.INSTANCE); +// if (engineeringMode) pluginsList.add(TidepoolPlugin.INSTANCE); pluginsList.add(MaintenancePlugin.initPlugin(this)); if (engineeringMode) pluginsList.add(AutomationPlugin.INSTANCE); @@ -453,7 +453,7 @@ public class MainApp extends Application { unregisterReceiver(btReceiver); } - if (timeDateOrTZChangeReceiver!=null) { + if (timeDateOrTZChangeReceiver != null) { unregisterReceiver(timeDateOrTZChangeReceiver); } From 99b5e1e9d55cea1ab6c88ad52c6e2d687fdedb5d Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Mon, 2 Sep 2019 08:44:21 +0200 Subject: [PATCH 2/3] fix NPE --- .../info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java index 0425190723..d3f6cc8212 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java @@ -291,7 +291,7 @@ public class LoopPlugin extends PluginBase { Profile profile = ProfileFunctions.getInstance().getProfile(); - if (!ProfileFunctions.getInstance().isProfileValid("Loop")) { + if (profile == null || !ProfileFunctions.getInstance().isProfileValid("Loop")) { if (L.isEnabled(L.APS)) log.debug(MainApp.gs(R.string.noprofileselected)); RxBus.INSTANCE.send(new EventLoopSetLastRunGui(MainApp.gs(R.string.noprofileselected))); From 11ca21ebbd27093d8b9b9ad723b3e65047c3ddc9 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Mon, 2 Sep 2019 08:55:08 +0200 Subject: [PATCH 3/3] automation without engineering mode --- app/src/main/java/info/nightscout/androidaps/MainApp.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.java b/app/src/main/java/info/nightscout/androidaps/MainApp.java index f2edd23882..303e9ee4c9 100644 --- a/app/src/main/java/info/nightscout/androidaps/MainApp.java +++ b/app/src/main/java/info/nightscout/androidaps/MainApp.java @@ -226,8 +226,7 @@ public class MainApp extends Application { if (engineeringMode) pluginsList.add(TidepoolPlugin.INSTANCE); pluginsList.add(MaintenancePlugin.initPlugin(this)); - if (engineeringMode) - pluginsList.add(AutomationPlugin.INSTANCE); + pluginsList.add(AutomationPlugin.INSTANCE); pluginsList.add(ConfigBuilderPlugin.getPlugin());