From c6e8ab35b649b3163f263cc69892aa53b38e5f91 Mon Sep 17 00:00:00 2001 From: "Markus M. May" Date: Sat, 17 Mar 2018 21:35:16 +0100 Subject: [PATCH] Fix boolean stuff in accordance to code review with adrian --- app/src/main/java/info/nightscout/androidaps/MainApp.java | 2 +- .../androidaps/plugins/ConstraintsSafety/SafetyPlugin.java | 2 +- 2 files changed, 2 insertions(+), 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 d6d18576e5..620d26bd8a 100644 --- a/app/src/main/java/info/nightscout/androidaps/MainApp.java +++ b/app/src/main/java/info/nightscout/androidaps/MainApp.java @@ -208,7 +208,7 @@ public class MainApp extends Application { engineeringMode = engineeringModeSemaphore.exists() && engineeringModeSemaphore.isFile(); devBranch = BuildConfig.VERSION.contains("dev"); - if (devBranch && !engineeringMode) { + if (!isDevModeOrRelease()) { Notification n = new Notification(Notification.TOAST_ALARM, gs(R.string.closed_loop_disabled_on_dev_branch), Notification.NORMAL); bus().post(new EventNewNotification(n)); } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsSafety/SafetyPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsSafety/SafetyPlugin.java index 37000f345c..7686d76cc9 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsSafety/SafetyPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsSafety/SafetyPlugin.java @@ -102,7 +102,7 @@ public class SafetyPlugin implements PluginBase, ConstraintsInterface { **/ @Override public boolean isClosedModeEnabled() { - if (MainApp.devBranch && !MainApp.engineeringMode) return false; + if (!MainApp.isDevModeOrRelease()) return false; String mode = SP.getString("aps_mode", "open"); return mode.equals("closed") && BuildConfig.CLOSEDLOOP; }