Correct merge

app/src/main/java/info/nightscout/androidaps/MainActivity.java

@@ -400,6 +400,8 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
                                     builder.setIcon(R.mipmap.blueowl);
                                 String message = "Build: " + BuildConfig.BUILDVERSION + "\n";
                                 message += MainApp.sResources.getString(R.string.configbuilder_nightscoutversion_label) + " " + ConfigBuilderPlugin.nightscoutVersionName;
+                                if (MainApp.engineeringMode)
+                                    message += MainApp.gs(R.string.engineering_mode_enabled);
                                 builder.setMessage(message);
                                 builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), null);
                                 AlertDialog alertDialog = builder.create();

app/src/main/java/info/nightscout/androidaps/MainApp.java

@@ -20,6 +20,7 @@ import net.danlew.android.joda.JodaTimeAndroid;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
 import java.util.ArrayList;
 
 import info.nightscout.androidaps.Services.Intents;
@@ -46,6 +47,8 @@ import info.nightscout.androidaps.plugins.OpenAPSAMA.OpenAPSAMAPlugin;
 import info.nightscout.androidaps.plugins.OpenAPSMA.OpenAPSMAPlugin;
 import info.nightscout.androidaps.plugins.OpenAPSSMB.OpenAPSSMBPlugin;
 import info.nightscout.androidaps.plugins.Overview.OverviewPlugin;
+import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Persistentnotification.PersistentNotificationPlugin;
 import info.nightscout.androidaps.plugins.ProfileLocal.LocalProfilePlugin;
 import info.nightscout.androidaps.plugins.ProfileNS.NSProfilePlugin;
@@ -95,6 +98,9 @@ public class MainApp extends Application {
     private static AckAlarmReceiver ackAlarmReciever = new AckAlarmReceiver();
     private LocalBroadcastManager lbm;
 
+    public static boolean devBranch;
+    public static boolean engineeringMode;
+
     @Override
     public void onCreate() {
         super.onCreate();
@@ -139,7 +145,7 @@ public class MainApp extends Application {
             if (Config.DANAR) pluginsList.add(DanaRv2Plugin.getPlugin());
             if (Config.DANAR) pluginsList.add(DanaRSPlugin.getPlugin());
             pluginsList.add(CareportalPlugin.getPlugin());
-            // if (Config.DANAR) pluginsList.add(InsightPumpPlugin.getPlugin()); // <-- Enable Insight plugin here
+            if (Config.DANAR && engineeringMode) pluginsList.add(InsightPumpPlugin.getPlugin()); // <-- Enable Insight plugin here
             if (Config.MDI) pluginsList.add(MDIPlugin.getPlugin());
             if (Config.VIRTUALPUMP) pluginsList.add(VirtualPumpPlugin.getPlugin());
             if (Config.APS) pluginsList.add(LoopPlugin.getPlugin());
@@ -195,6 +201,15 @@ public class MainApp extends Application {
             }
         }).start();
 
+        File engineeringModeSemaphore = new File(System.getProperty("EXT_FILES_DIR"),"engineering_mode");
+
+        engineeringMode = engineeringModeSemaphore.exists() && engineeringModeSemaphore.isFile();
+        devBranch = BuildConfig.VERSION.contains("dev");
+
+        if (devBranch && !engineeringMode) {
+            Notification n = new Notification(Notification.TOAST_ALARM, gs(R.string.closed_loop_disabled_on_dev_branch), Notification.NORMAL);
+            bus().post(new EventNewNotification(n));
+        }
     }
 
     private void registerLocalBroadcastReceiver() {
@@ -361,6 +376,10 @@ public class MainApp extends Application {
         return null;
     }
 
+    public static boolean isDevModeOrRelease() {
+        return (devBranch && engineeringMode) || !devBranch;
+    }
+
     @Override
     public void onTerminate() {
         super.onTerminate();

app/src/main/java/info/nightscout/androidaps/plugins/Actions/ActionsFragment.java

@@ -127,12 +127,14 @@ public class ActionsFragment extends SubscriberFragment implements View.OnClickL
                         return;
                     }
                     final PumpInterface pump = ConfigBuilderPlugin.getActivePump();
-                    if (!pump.getPumpDescription().isSetBasalProfileCapable || !pump.isInitialized() || pump.isSuspended())
+                    final boolean basalprofileEnabled = MainApp.isDevModeOrRelease()
+                            && pump.getPumpDescription().isSetBasalProfileCapable;
+
+                    if (!basalprofileEnabled || !pump.isInitialized() || pump.isSuspended())
                         profileSwitch.setVisibility(View.GONE);
                     else
                         profileSwitch.setVisibility(View.VISIBLE);
 
-
                     if (!pump.getPumpDescription().isExtendedBolusCapable || !pump.isInitialized() || pump.isSuspended() || pump.isFakingTempsByExtendedBoluses()) {
                         extendedBolus.setVisibility(View.GONE);
                         extendedBolusCancel.setVisibility(View.GONE);

app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsSafety/SafetyPlugin.java

@@ -102,6 +102,7 @@ public class SafetyPlugin implements PluginBase, ConstraintsInterface {
      **/
     @Override
     public boolean isClosedModeEnabled() {
+        if (MainApp.devBranch && !MainApp.engineeringMode) return false;
         String mode = SP.getString("aps_mode", "open");
         return mode.equals("closed") && BuildConfig.CLOSEDLOOP;
     }

app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java

@@ -59,6 +59,7 @@ public class Notification {
     public static final int MINIMAL_BASAL_VALUE_REPLACED = 29;
     public static final int BASAL_PROFILE_NOT_ALIGNED_TO_HOURS = 30;
     public static final int ZERO_VALUE_IN_PROFILE = 31;
+    public static final int NOT_ENG_MODE_OR_RELEASE = 32;
 
     public int id;
     public Date date;

app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java

@@ -293,6 +293,14 @@ public class CommandQueue {
             return false;
         }
 
+        if (!MainApp.isDevModeOrRelease()) {
+            Notification notification = new Notification(Notification.NOT_ENG_MODE_OR_RELEASE, MainApp.sResources.getString(R.string.not_eng_mode_or_release), Notification.URGENT);
+            MainApp.bus().post(new EventNewNotification(notification));
+            if (callback != null)
+                callback.result(new PumpEnactResult().success(false).comment(MainApp.sResources.getString(R.string.not_eng_mode_or_release))).run();
+            return false;
+        }
+
         // Compare with pump limits
         Profile.BasalValue[] basalValues = profile.getBasalValues();
         PumpInterface pump = ConfigBuilderPlugin.getActivePump();

app/src/main/res/values/strings.xml

@@ -987,5 +987,8 @@
     <string name="overview_show_cob">Carbs On Board</string>
     <string name="overview_show_iob">Insulin On Board</string>
     <string name="overview_show_basals">Basals</string>
+    <string name="closed_loop_disabled_on_dev_branch">Running dev version. Closed loop is disabled</string>
+    <string name="engineering_mode_enabled">Engineering mode enabled</string>
+    <string name="not_eng_mode_or_release">Engineering mode not enabled and not on release branch</string>
 </resources>