Merge branch 'dev' into medtronic_andy (2.0i - 24.10.2018)

app/build.gradle

@@ -2,25 +2,17 @@ buildscript {
     repositories {
         maven { url 'https://maven.fabric.io/public' }
         jcenter()
-
-        google()
-        maven {
-            url 'http://oss.jfrog.org/artifactory/oss-snapshot-local'
-        }
     }
 
     dependencies {
         classpath 'io.fabric.tools:gradle:1.+'
         classpath 'com.dicedmelon.gradle:jacoco-android:0.1.2'
-        //classpath 'io.realm:realm-gradle-plugin:1.1.1'
-        classpath 'io.realm:realm-gradle-plugin:4.0.0'
     }
 }
 apply plugin: "com.android.application"
 apply plugin: "io.fabric"
 apply plugin: "jacoco-android"
 apply plugin: 'com.jakewharton.butterknife'
-apply plugin: 'realm-android'
 
 ext {
     supportLibraryVersion = "27.1.0"
@@ -71,12 +63,12 @@ android {
         targetSdkVersion 25
         multiDexEnabled true
         versionCode 1500
-        // dev_version: 2.0g
+        // dev_version: 2.0i
         version "medtronic-0.4.0-snapshot"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
         buildConfigField "String", "HEAD", '"' + generateGitBuild() + '"'
-        buildConfigField "String", "DEV_VERSION", '"2.0g"'
+        buildConfigField "String", "DEV_VERSION", '"2.0i"'
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         ndk {
@@ -111,7 +103,7 @@ android {
             resValue "string", "app_name", "AndroidAPS"
             versionName version
             manifestPlaceholders = [
-                    appIcon     : "@mipmap/ic_launcher",
+                    appIcon: "@mipmap/ic_launcher",
                     appIconRound: "@mipmap/ic_launcher_round"
             ]
         }
@@ -121,7 +113,7 @@ android {
             resValue "string", "app_name", "AndroidAPS"
             versionName version
             manifestPlaceholders = [
-                    appIcon     : "@mipmap/blueowl",
+                    appIcon: "@mipmap/blueowl",
                     appIconRound: "@null"
             ]
         }
@@ -131,7 +123,7 @@ android {
             resValue "string", "app_name", "NSClient"
             versionName version + "-nsclient"
             manifestPlaceholders = [
-                    appIcon     : "@mipmap/yellowowl",
+                    appIcon: "@mipmap/yellowowl",
                     appIconRound: "@null"
             ]
         }
@@ -141,7 +133,7 @@ android {
             resValue "string", "app_name", "NSClient2"
             versionName version + "-nsclient"
             manifestPlaceholders = [
-                    appIcon     : "@mipmap/yellowowl",
+                    appIcon: "@mipmap/yellowowl",
                     appIconRound: "@null"
             ]
         }
@@ -201,7 +193,6 @@ dependencies {
         exclude group: "com.google.android", module: "android"
     }
     implementation "org.apache.commons:commons-lang3:3.6"
-    implementation "commons-collections:commons-collections:3.2.1"
     implementation "org.slf4j:slf4j-api:1.7.12"
     implementation "com.jjoe64:graphview:4.0.1"
     implementation "com.joanzapata.iconify:android-iconify-fontawesome:2.1.1"
@@ -209,8 +200,6 @@ dependencies {
     implementation(name: "android-edittext-validator-v1.3.4-mod", ext: "aar")
     implementation(name: "sightparser-release", ext: "aar")
 
-    implementation "com.android.support:support-core-utils:${supportLibraryVersion}"
-
     implementation("com.google.android:flexbox:0.3.0") {
         exclude group: "com.android.support"
     }

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

@@ -182,7 +182,7 @@ public class MainActivity extends AppCompatActivity {
 
     @Subscribe
     public void onStatusEvent(final EventRefreshGui ev) {
-        String lang = SP.getString("language", "en");
+        String lang = SP.getString(R.string.key_language, "en");
         LocaleHelper.setLocale(getApplicationContext(), lang);
         runOnUiThread(() -> {
             if (ev.recreate) {

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

@@ -1,25 +1,12 @@
 package info.nightscout.androidaps;
 
-import java.io.File;
-import java.util.ArrayList;
-
-import net.danlew.android.joda.JodaTimeAndroid;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import android.app.Application;
-import android.bluetooth.BluetoothAdapter;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.Resources;
 import android.os.SystemClock;
 import android.support.annotation.Nullable;
 import android.support.annotation.PluralsRes;
 import android.support.v4.content.LocalBroadcastManager;
-import android.util.Log;
 
 import com.crashlytics.android.Crashlytics;
 import com.crashlytics.android.answers.Answers;
@@ -28,6 +15,14 @@ import com.squareup.otto.Bus;
 import com.squareup.otto.LoggingBus;
 import com.squareup.otto.ThreadEnforcer;
 
+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.data.ConstraintChecker;
 import info.nightscout.androidaps.db.DatabaseHelper;
 import info.nightscout.androidaps.interfaces.PluginBase;
@@ -44,9 +39,8 @@ import info.nightscout.androidaps.plugins.Insulin.InsulinOrefFreePeakPlugin;
 import info.nightscout.androidaps.plugins.Insulin.InsulinOrefRapidActingPlugin;
 import info.nightscout.androidaps.plugins.Insulin.InsulinOrefUltraRapidActingPlugin;
 import info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin;
-import info.nightscout.androidaps.plugins.Loop.LoopPlugin;
-import info.nightscout.androidaps.plugins.Maintenance.LoggerUtils;
 import info.nightscout.androidaps.plugins.Maintenance.MaintenancePlugin;
+import info.nightscout.androidaps.plugins.Loop.LoopPlugin;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSClientPlugin;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
 import info.nightscout.androidaps.plugins.NSClientInternal.receivers.AckAlarmReceiver;
@@ -60,15 +54,12 @@ import info.nightscout.androidaps.plugins.ProfileLocal.LocalProfilePlugin;
 import info.nightscout.androidaps.plugins.ProfileNS.NSProfilePlugin;
 import info.nightscout.androidaps.plugins.ProfileSimple.SimpleProfilePlugin;
 import info.nightscout.androidaps.plugins.PumpCombo.ComboPlugin;
-import info.nightscout.androidaps.plugins.PumpCommon.hw.rileylink.RileyLinkConst;
-import info.nightscout.androidaps.plugins.PumpCommon.hw.rileylink.RileyLinkUtil;
 import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
 import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPlugin;
 import info.nightscout.androidaps.plugins.PumpDanaRS.DanaRSPlugin;
 import info.nightscout.androidaps.plugins.PumpDanaRv2.DanaRv2Plugin;
 import info.nightscout.androidaps.plugins.PumpInsight.InsightPlugin;
 import info.nightscout.androidaps.plugins.PumpMDI.MDIPlugin;
-import info.nightscout.androidaps.plugins.PumpMedtronic.MedtronicPumpPlugin;
 import info.nightscout.androidaps.plugins.PumpVirtual.VirtualPumpPlugin;
 import info.nightscout.androidaps.plugins.Sensitivity.SensitivityAAPSPlugin;
 import info.nightscout.androidaps.plugins.Sensitivity.SensitivityOref0Plugin;
@@ -89,10 +80,11 @@ import info.nightscout.androidaps.receivers.KeepAliveReceiver;
 import info.nightscout.androidaps.receivers.NSAlarmReceiver;
 import info.nightscout.androidaps.services.Intents;
 import info.nightscout.utils.FabricPrivacy;
+import info.nightscout.androidaps.plugins.Maintenance.LoggerUtils;
 import io.fabric.sdk.android.Fabric;
 
-public class MainApp extends Application {
 
+public class MainApp extends Application {
     private static Logger log = LoggerFactory.getLogger(L.CORE);
     private static KeepAliveReceiver keepAliveReceiver;
 
@@ -101,7 +93,6 @@ public class MainApp extends Application {
     public static Resources sResources;
 
     private static DatabaseHelper sDatabaseHelper = null;
-    private static ConfigBuilderPlugin sConfigBuilder = null;
     private static ConstraintChecker sConstraintsChecker = null;
 
     private static ArrayList<PluginBase> pluginsList = null;
@@ -116,7 +107,6 @@ public class MainApp extends Application {
     public static boolean devBranch;
     public static boolean engineeringMode;
 
-
     @Override
     public void onCreate() {
         super.onCreate();
@@ -158,8 +148,7 @@ public class MainApp extends Application {
             // Register all tabs in app here
             pluginsList.add(OverviewPlugin.getPlugin());
             pluginsList.add(IobCobCalculatorPlugin.getPlugin());
-            if (Config.ACTION)
+            if (Config.ACTION) pluginsList.add(ActionsFragment.getPlugin());
-                pluginsList.add(ActionsFragment.getPlugin());
             pluginsList.add(InsulinOrefRapidActingPlugin.getPlugin());
             pluginsList.add(InsulinOrefUltraRapidActingPlugin.getPlugin());
             pluginsList.add(InsulinOrefFreePeakPlugin.getPlugin());
@@ -167,50 +156,33 @@ public class MainApp extends Application {
             pluginsList.add(SensitivityAAPSPlugin.getPlugin());
             pluginsList.add(SensitivityWeightedAveragePlugin.getPlugin());
             pluginsList.add(SensitivityOref1Plugin.getPlugin());
-            if (Config.PUMPDRIVERS)
+            if (Config.PUMPDRIVERS) pluginsList.add(DanaRPlugin.getPlugin());
-                pluginsList.add(DanaRPlugin.getPlugin());
+            if (Config.PUMPDRIVERS) pluginsList.add(DanaRKoreanPlugin.getPlugin());
-            if (Config.PUMPDRIVERS)
+            if (Config.PUMPDRIVERS) pluginsList.add(DanaRv2Plugin.getPlugin());
-                pluginsList.add(DanaRKoreanPlugin.getPlugin());
+            if (Config.PUMPDRIVERS) pluginsList.add(DanaRSPlugin.getPlugin());
-            if (Config.PUMPDRIVERS)
-                pluginsList.add(DanaRv2Plugin.getPlugin());
-            if (Config.PUMPDRIVERS)
-                pluginsList.add(DanaRSPlugin.getPlugin());
             pluginsList.add(CareportalPlugin.getPlugin());
             if (Config.PUMPDRIVERS && engineeringMode)
                 pluginsList.add(InsightPlugin.getPlugin()); // <-- Enable Insight plugin here
-            if (Config.PUMPDRIVERS)
+            if (Config.PUMPDRIVERS) pluginsList.add(ComboPlugin.getPlugin());
-                pluginsList.add(ComboPlugin.getPlugin());
+            if (Config.MDI) pluginsList.add(MDIPlugin.getPlugin());
-            if (Config.PUMPDRIVERS && engineeringMode)
-                pluginsList.add(MedtronicPumpPlugin.getPlugin());
-            if (Config.MDI)
-                pluginsList.add(MDIPlugin.getPlugin());
             pluginsList.add(VirtualPumpPlugin.getPlugin());
-            if (Config.APS)
+            if (Config.APS) pluginsList.add(LoopPlugin.getPlugin());
-                pluginsList.add(LoopPlugin.getPlugin());
+            if (Config.APS) pluginsList.add(OpenAPSMAPlugin.getPlugin());
-            if (Config.APS)
+            if (Config.APS) pluginsList.add(OpenAPSAMAPlugin.getPlugin());
-                pluginsList.add(OpenAPSMAPlugin.getPlugin());
+            if (Config.APS) pluginsList.add(OpenAPSSMBPlugin.getPlugin());
-            if (Config.APS)
-                pluginsList.add(OpenAPSAMAPlugin.getPlugin());
-            if (Config.APS)
-                pluginsList.add(OpenAPSSMBPlugin.getPlugin());
             pluginsList.add(NSProfilePlugin.getPlugin());
-            if (Config.OTHERPROFILES)
+            if (Config.OTHERPROFILES) pluginsList.add(SimpleProfilePlugin.getPlugin());
-                pluginsList.add(SimpleProfilePlugin.getPlugin());
+            if (Config.OTHERPROFILES) pluginsList.add(LocalProfilePlugin.getPlugin());
-            if (Config.OTHERPROFILES)
-                pluginsList.add(LocalProfilePlugin.getPlugin());
             pluginsList.add(TreatmentsPlugin.getPlugin());
-            if (Config.SAFETY)
+            if (Config.SAFETY) pluginsList.add(SafetyPlugin.getPlugin());
-                pluginsList.add(SafetyPlugin.getPlugin());
+            if (Config.APS) pluginsList.add(ObjectivesPlugin.getPlugin());
-            if (Config.APS)
-                pluginsList.add(ObjectivesPlugin.getPlugin());
             pluginsList.add(SourceXdripPlugin.getPlugin());
             pluginsList.add(SourceNSClientPlugin.getPlugin());
             pluginsList.add(SourceMM640gPlugin.getPlugin());
             pluginsList.add(SourceGlimpPlugin.getPlugin());
             pluginsList.add(SourceDexcomG5Plugin.getPlugin());
             pluginsList.add(SourcePoctechPlugin.getPlugin());
-            if (Config.SMSCOMMUNICATORENABLED)
+            if (Config.SMSCOMMUNICATORENABLED) pluginsList.add(SmsCommunicatorPlugin.getPlugin());
-                pluginsList.add(SmsCommunicatorPlugin.getPlugin());
             pluginsList.add(FoodPlugin.getPlugin());
 
             pluginsList.add(WearPlugin.initPlugin(this));
@@ -219,24 +191,23 @@ public class MainApp extends Application {
             pluginsList.add(NSClientPlugin.getPlugin());
             pluginsList.add(MaintenancePlugin.initPlugin(this));
 
-            pluginsList.add(sConfigBuilder = ConfigBuilderPlugin.getPlugin());
+            pluginsList.add(ConfigBuilderPlugin.getPlugin());
 
-            MainApp.getConfigBuilder().initialize();
+            ConfigBuilderPlugin.getPlugin().initialize();
         }
 
         NSUpload.uploadAppStart();
 
-        final PumpInterface pump = ConfigBuilderPlugin.getActivePump();
+        final PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
         if (pump != null) {
             new Thread(() -> {
                 SystemClock.sleep(5000);
-                ConfigBuilderPlugin.getCommandQueue().readStatus("Initialization", null);
+                ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("Initialization", null);
                 startKeepAliveService();
             }).start();
         }
     }
 
-
     private void registerLocalBroadcastReceiver() {
         lbm = LocalBroadcastManager.getInstance(this);
         lbm.registerReceiver(dataReceiver, new IntentFilter(Intents.ACTION_NEW_TREATMENT));
@@ -252,16 +223,16 @@ public class MainApp extends Application {
         lbm.registerReceiver(dataReceiver, new IntentFilter(Intents.ACTION_NEW_DEVICESTATUS));
         lbm.registerReceiver(dataReceiver, new IntentFilter(Intents.ACTION_NEW_CAL));
 
-        // register alarms
+        //register alarms
         lbm.registerReceiver(alarmReciever, new IntentFilter(Intents.ACTION_ALARM));
         lbm.registerReceiver(alarmReciever, new IntentFilter(Intents.ACTION_ANNOUNCEMENT));
         lbm.registerReceiver(alarmReciever, new IntentFilter(Intents.ACTION_CLEAR_ALARM));
         lbm.registerReceiver(alarmReciever, new IntentFilter(Intents.ACTION_URGENT_ALARM));
 
-        // register ack alarm
+        //register ack alarm
         lbm.registerReceiver(ackAlarmReciever, new IntentFilter(Intents.ACTION_ACK_ALARM));
 
-        // register dbaccess
+        //register dbaccess
         lbm.registerReceiver(dbAccessReciever, new IntentFilter(Intents.ACTION_DATABASE));
     }
 
@@ -309,13 +280,11 @@ public class MainApp extends Application {
         }
     }
 
-
     public void stopKeepAliveService() {
         if (keepAliveReceiver != null)
             KeepAliveReceiver.cancelAlarm(this);
     }
 
-
     public static void subscribe(Object subscriber) {
         try {
             bus().register(subscriber);
@@ -324,7 +293,6 @@ public class MainApp extends Application {
         }
     }
 
-
     public static void unsubscribe(Object subscriber) {
         try {
             bus().unregister(subscriber);
@@ -333,42 +301,34 @@ public class MainApp extends Application {
         }
     }
 
-
     public static Bus bus() {
         return sBus;
     }
 
-
     public static String gs(int id) {
         return sResources.getString(id);
     }
 
-
     public static String gs(int id, Object... args) {
         return sResources.getString(id, args);
     }
 
-
     public static String gq(@PluralsRes int id, int quantity, Object... args) {
         return sResources.getQuantityString(id, quantity, args);
     }
 
-
     public static int gc(int id) {
         return sResources.getColor(id);
     }
 
-
     public static MainApp instance() {
         return sInstance;
     }
 
-
     public static DatabaseHelper getDbHelper() {
         return sDatabaseHelper;
     }
 
-
     public static void closeDbHelper() {
         if (sDatabaseHelper != null) {
             sDatabaseHelper.close();
@@ -376,22 +336,14 @@ public class MainApp extends Application {
         }
     }
 
-
-    public static ConfigBuilderPlugin getConfigBuilder() {
-        return sConfigBuilder;
-    }
-
-
     public static ConstraintChecker getConstraintChecker() {
         return sConstraintsChecker;
     }
 
-
     public static ArrayList<PluginBase> getPluginsList() {
         return pluginsList;
     }
 
-
     public static ArrayList<PluginBase> getSpecificPluginsList(PluginType type) {
         ArrayList<PluginBase> newList = new ArrayList<>();
 
@@ -406,7 +358,6 @@ public class MainApp extends Application {
         return newList;
     }
 
-
     public static ArrayList<PluginBase> getSpecificPluginsVisibleInList(PluginType type) {
         ArrayList<PluginBase> newList = new ArrayList<>();
 
@@ -422,7 +373,6 @@ public class MainApp extends Application {
         return newList;
     }
 
-
     public static ArrayList<PluginBase> getSpecificPluginsListByInterface(Class interfaceClass) {
         ArrayList<PluginBase> newList = new ArrayList<>();
 
@@ -437,7 +387,6 @@ public class MainApp extends Application {
         return newList;
     }
 
-
     public static ArrayList<PluginBase> getSpecificPluginsVisibleInListByInterface(Class interfaceClass, PluginType type) {
         ArrayList<PluginBase> newList = new ArrayList<>();
 
@@ -453,13 +402,12 @@ public class MainApp extends Application {
         return newList;
     }
 
-
     @Nullable
     public static <T extends PluginBase> T getSpecificPlugin(Class<T> pluginClass) {
         if (pluginsList != null) {
             for (PluginBase p : pluginsList) {
                 if (pluginClass.isAssignableFrom(p.getClass()))
-                    return (T)p;
+                    return (T) p;
             }
         } else {
             log.error("pluginsList=null");
@@ -467,19 +415,16 @@ public class MainApp extends Application {
         return null;
     }
 
-
     public static boolean isEngineeringModeOrRelease() {
         if (!Config.APS)
             return true;
         return engineeringMode || !devBranch;
     }
 
-
     public static boolean isDev() {
         return devBranch;
     }
 
-
     @Override
     public void onTerminate() {
         if (L.isEnabled(L.CORE))

app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.java

@@ -229,7 +229,7 @@ public class HistoryBrowseActivity extends AppCompatActivity {
         if (noProfile == null || buttonDate == null || buttonZoom == null || bgGraph == null || iobGraph == null || seekBar == null)
             return;
 
-        final PumpInterface pump = ConfigBuilderPlugin.getActivePump();
+        final PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
         final Profile profile = ProfileFunctions.getInstance().getProfile();
 
         if (profile == null) {

app/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.java

@@ -130,7 +130,7 @@ public class TDDStatsActivity extends Activity {
         }
         totalBaseBasal.setText(TBB);
 
-        if (!ConfigBuilderPlugin.getActivePump().getPumpDescription().needsManualTDDLoad)
+        if (!ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().needsManualTDDLoad)
             reloadButton.setVisibility(View.GONE);
 
         // stats table
@@ -239,7 +239,7 @@ public class TDDStatsActivity extends Activity {
                         statsMessage.setText(MainApp.gs(R.string.danar_stats_warning_Message));
                     }
                 });
-                ConfigBuilderPlugin.getCommandQueue().loadTDDs( new Callback() {
+                ConfigBuilderPlugin.getPlugin().getCommandQueue().loadTDDs( new Callback() {
                     @Override
                     public void run() {
                         loadDataFromDB();
@@ -440,7 +440,7 @@ public class TDDStatsActivity extends Activity {
                             TableLayout.LayoutParams.WRAP_CONTENT));
                 }
 
-                if (isOldData(historyList) && ConfigBuilderPlugin.getActivePump().getPumpDescription().needsManualTDDLoad) {
+                if (isOldData(historyList) && ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().needsManualTDDLoad) {
                     statsMessage.setVisibility(View.VISIBLE);
                     statsMessage.setText(MainApp.gs(R.string.danar_stats_olddata_Message));
 
@@ -545,7 +545,7 @@ public class TDDStatsActivity extends Activity {
 
 
     public static boolean isOldData(List<TDD> historyList) {
-        Object activePump = MainApp.getConfigBuilder().getActivePump();
+        Object activePump = ConfigBuilderPlugin.getPlugin().getActivePump();
         PumpInterface dana = MainApp.getSpecificPlugin(DanaRPlugin.class);
         PumpInterface danaRS = MainApp.getSpecificPlugin(DanaRSPlugin.class);
         PumpInterface danaV2 = MainApp.getSpecificPlugin(DanaRv2Plugin.class);

app/src/main/java/info/nightscout/androidaps/data/ConstraintChecker.java

@@ -42,6 +42,10 @@ public class ConstraintChecker implements ConstraintsInterface {
         return isSMBModeEnabled(new Constraint<>(true));
     }
 
+    public Constraint<Boolean> isUAMEnabled() {
+        return isUAMEnabled(new Constraint<>(true));
+    }
+
     public Constraint<Boolean> isAdvancedFilteringEnabled() {
         return isAdvancedFilteringEnabled(new Constraint<>(true));
     }
@@ -130,6 +134,18 @@ public class ConstraintChecker implements ConstraintsInterface {
         return value;
     }
 
+    @Override
+    public Constraint<Boolean> isUAMEnabled(Constraint<Boolean> value) {
+
+        ArrayList<PluginBase> constraintsPlugins = mainApp.getSpecificPluginsListByInterface(ConstraintsInterface.class);
+        for (PluginBase p : constraintsPlugins) {
+            ConstraintsInterface constraint = (ConstraintsInterface) p;
+            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue;
+            constraint.isUAMEnabled(value);
+        }
+        return value;
+    }
+
     @Override
     public Constraint<Boolean> isAdvancedFilteringEnabled(Constraint<Boolean> value) {
         ArrayList<PluginBase> constraintsPlugins = mainApp.getSpecificPluginsListByInterface(ConstraintsInterface.class);

app/src/main/java/info/nightscout/androidaps/data/Profile.java

@@ -12,12 +12,12 @@ import java.text.DecimalFormat;
 import java.util.Calendar;
 import java.util.TimeZone;
 
-import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.interfaces.PumpInterface;
+import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.utils.DateUtil;
@@ -221,7 +221,7 @@ public class Profile {
 
         if (isValid) {
             // Check for hours alignment
-            PumpInterface pump = MainApp.getConfigBuilder().getActivePump();
+            PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
             if (pump != null && !pump.getPumpDescription().is30minBasalRatesCapable) {
                 for (int index = 0; index < basal_v.size(); index++) {
                     long secondsFromMidnight = basal_v.keyAt(index);

app/src/main/java/info/nightscout/androidaps/db/BgReading.java

@@ -220,14 +220,8 @@ public class BgReading implements DataPointWithLabelInterface {
     @Override
     public int getColor() {
         String units = ProfileFunctions.getInstance().getProfileUnits();
-        Double lowLine = SP.getDouble("low_mark", 0d);
+        Double lowLine = OverviewPlugin.getPlugin().determineLowLine(units);
-        Double highLine = SP.getDouble("high_mark", 0d);
+        Double highLine = OverviewPlugin.getPlugin().determineHighLine(units);
-        if (lowLine < 1) {
-            lowLine = Profile.fromMgdlToUnits(OverviewPlugin.bgTargetLow, units);
-        }
-        if (highLine < 1) {
-            highLine = Profile.fromMgdlToUnits(OverviewPlugin.bgTargetHigh, units);
-        }
         int color = MainApp.gc(R.color.inrange);
         if (isPrediction())
             return getPredectionColor();

app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java

@@ -27,6 +27,7 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
+import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.data.OverlappingIntervals;
 import info.nightscout.androidaps.data.Profile;
@@ -43,6 +44,7 @@ import info.nightscout.androidaps.events.EventTempBasalChange;
 import info.nightscout.androidaps.events.EventTempTargetChange;
 import info.nightscout.androidaps.interfaces.ProfileInterface;
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
 import info.nightscout.androidaps.plugins.IobCobCalculator.events.EventNewHistoryData;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
@@ -699,7 +701,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
 
     public void createTemptargetFromJsonIfNotExists(JSONObject trJson) {
         try {
-            String units = JsonHelper.safeGetString(trJson, "units", ProfileFunctions.getInstance().getProfileUnits());
+            String units = JsonHelper.safeGetString(trJson, "units", Constants.MGDL);
             TempTarget tempTarget = new TempTarget()
                     .date(trJson.getLong("mills"))
                     .duration(trJson.getInt("duration"))
@@ -1584,7 +1586,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             if (trJson.has("profileJson"))
                 profileSwitch.profileJson = trJson.getString("profileJson");
             else {
-                ProfileInterface profileInterface = MainApp.getConfigBuilder().getActiveProfileInterface();
+                ProfileInterface profileInterface = ConfigBuilderPlugin.getPlugin().getActiveProfileInterface();
                 if (profileInterface != null) {
                     ProfileStore store = profileInterface.getProfile();
                     if (store != null) {

app/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java

@@ -218,7 +218,7 @@ public class ExtendedBolus implements Interval, DataPointWithLabelInterface {
 
     public IobTotal iobCalc(long time) {
         IobTotal result = new IobTotal(time);
-        InsulinInterface insulinInterface = ConfigBuilderPlugin.getActiveInsulin();
+        InsulinInterface insulinInterface = ConfigBuilderPlugin.getPlugin().getActiveInsulin();
 
         int realDuration = getDurationToTime(time);
 

app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java

@@ -228,7 +228,7 @@ public class TemporaryBasal implements Interval {
         }
 
         IobTotal result = new IobTotal(time);
-        InsulinInterface insulinInterface = ConfigBuilderPlugin.getActiveInsulin();
+        InsulinInterface insulinInterface = ConfigBuilderPlugin.getPlugin().getActiveInsulin();
 
         int realDuration = getDurationToTime(time);
         double netBasalAmount = 0d;

app/src/main/java/info/nightscout/androidaps/interfaces/ConstraintsInterface.java

@@ -27,6 +27,10 @@ public interface ConstraintsInterface {
         return value;
     }
 
+    default Constraint<Boolean> isUAMEnabled(Constraint<Boolean> value) {
+        return value;
+    }
+
     default Constraint<Boolean> isAdvancedFilteringEnabled(Constraint<Boolean> value) {
         return value;
     }

app/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.java

@@ -169,7 +169,7 @@ public abstract class PluginBase {
         if (getType() == PluginType.PUMP) {
             new Thread(() -> {
                 SystemClock.sleep(3000);
-                CommandQueue commandQueue = ConfigBuilderPlugin.getCommandQueue();
+                CommandQueue commandQueue = ConfigBuilderPlugin.getPlugin().getCommandQueue();
                 if (commandQueue != null)
                     commandQueue.readStatus("Pump driver changed.", null);
             }).start();

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

@@ -126,7 +126,7 @@ public class ActionsFragment extends SubscriberFragment implements View.OnClickL
             activity.runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
-                    if (MainApp.getConfigBuilder().getActiveProfileInterface() != null && MainApp.getConfigBuilder().getActiveProfileInterface().getProfile() != null) {
+                    if (ConfigBuilderPlugin.getPlugin().getActiveProfileInterface() != null && ConfigBuilderPlugin.getPlugin().getActiveProfileInterface().getProfile() != null) {
                         profileSwitch.setVisibility(View.VISIBLE);
                     } else {
                         profileSwitch.setVisibility(View.GONE);
@@ -142,7 +142,7 @@ public class ActionsFragment extends SubscriberFragment implements View.OnClickL
                         return;
                     }
 
-                    final PumpInterface pump = ConfigBuilderPlugin.getActivePump();
+                    final PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
                     final boolean basalprofileEnabled = MainApp.isEngineeringModeOrRelease()
                             && pump.getPumpDescription().isSetBasalProfileCapable;
 
@@ -192,7 +192,7 @@ public class ActionsFragment extends SubscriberFragment implements View.OnClickL
                     else
                         tempTarget.setVisibility(View.VISIBLE);
 
-                    if (!ConfigBuilderPlugin.getActivePump().getPumpDescription().supportsTDDs) tddStats.setVisibility(View.GONE);
+                    if (!ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().supportsTDDs) tddStats.setVisibility(View.GONE);
                     else tddStats.setVisibility(View.VISIBLE);
                 }
             });
@@ -223,13 +223,13 @@ public class ActionsFragment extends SubscriberFragment implements View.OnClickL
                 break;
             case R.id.actions_extendedbolus_cancel:
                 if (TreatmentsPlugin.getPlugin().isInHistoryExtendedBoluslInProgress()) {
-                    ConfigBuilderPlugin.getCommandQueue().cancelExtended(null);
+                    ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelExtended(null);
                     FabricPrivacy.getInstance().logCustom(new CustomEvent("CancelExtended"));
                 }
                 break;
             case R.id.actions_canceltempbasal:
                 if (TreatmentsPlugin.getPlugin().isTempBasalInProgress()) {
-                    ConfigBuilderPlugin.getCommandQueue().cancelTempBasal(true, null);
+                    ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelTempBasal(true, null);
                     FabricPrivacy.getInstance().logCustom(new CustomEvent("CancelTemp"));
                 }
                 break;

app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java

@@ -103,7 +103,7 @@ public class FillDialog extends DialogFragment implements OnClickListener {
         insulinCartridgeChangeCheckbox = view.findViewById(R.id.fill_cartridge_change);
 
         Double maxInsulin = MainApp.getConstraintChecker().getMaxBolusAllowed().value();
-        double bolusstep = ConfigBuilderPlugin.getActivePump().getPumpDescription().bolusStep;
+        double bolusstep = ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().bolusStep;
         editInsulin = view.findViewById(R.id.fill_insulinamount);
         editInsulin.setParams(0d, 0d, maxInsulin, bolusstep, DecimalFormatter.pumpSupportedBolusFormat(), false, textWatcher);
 
@@ -185,7 +185,7 @@ public class FillDialog extends DialogFragment implements OnClickListener {
                 confirmMessage.add(MainApp.gs(R.string.fillwarning));
                 confirmMessage.add("");
                 confirmMessage.add(MainApp.gs(R.string.bolus) + ": " + "<font color='" + MainApp.gc(R.color.colorCarbsButton) + "'>" + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints) + "U" + "</font>");
-                if (!insulinAfterConstraints.equals(insulin))
+                if (Math.abs(insulinAfterConstraints - insulin) > 0.01d)
                     confirmMessage.add("<font color='" + MainApp.gc(R.color.low) + "'>" + MainApp.gs(R.string.bolusconstraintapplied) + "</font>");
             }
 
@@ -223,7 +223,7 @@ public class FillDialog extends DialogFragment implements OnClickListener {
                             detailedBolusInfo.source = Source.USER;
                             detailedBolusInfo.isValid = false; // do not count it in IOB (for pump history)
                             detailedBolusInfo.notes = notes;
-                            ConfigBuilderPlugin.getCommandQueue().bolus(detailedBolusInfo, new Callback() {
+                            ConfigBuilderPlugin.getPlugin().getCommandQueue().bolus(detailedBolusInfo, new Callback() {
                                 @Override
                                 public void run() {
                                     if (!result.success) {

app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewExtendedBolusDialog.java

@@ -48,8 +48,8 @@ public class NewExtendedBolusDialog extends DialogFragment implements View.OnCli
         editInsulin = (NumberPicker) view.findViewById(R.id.overview_newextendedbolus_insulin);
         editInsulin.setParams(0d, 0d, maxInsulin, 0.1d, new DecimalFormat("0.00"), false);
 
-        double extendedDurationStep = ConfigBuilderPlugin.getActivePump().getPumpDescription().extendedBolusDurationStep;
+        double extendedDurationStep = ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().extendedBolusDurationStep;
-        double extendedMaxDuration = ConfigBuilderPlugin.getActivePump().getPumpDescription().extendedBolusMaxDuration;
+        double extendedMaxDuration = ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().extendedBolusMaxDuration;
         editDuration = (NumberPicker) view.findViewById(R.id.overview_newextendedbolus_duration);
         editDuration.setParams(extendedDurationStep, extendedDurationStep, extendedMaxDuration, extendedDurationStep, new DecimalFormat("0"), false);
 
@@ -87,7 +87,7 @@ public class NewExtendedBolusDialog extends DialogFragment implements View.OnCli
                     builder.setMessage(confirmMessage);
                     builder.setPositiveButton(MainApp.gs(R.string.ok), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int id) {
-                            ConfigBuilderPlugin.getCommandQueue().extendedBolus(finalInsulin, finalDurationInMinutes, new Callback() {
+                            ConfigBuilderPlugin.getPlugin().getCommandQueue().extendedBolus(finalInsulin, finalDurationInMinutes, new Callback() {
                                 @Override
                                 public void run() {
                                     if (!result.success) {

app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewTempBasalDialog.java

@@ -64,7 +64,7 @@ public class NewTempBasalDialog extends DialogFragment implements View.OnClickLi
         absoluteRadio = (RadioButton) view.findViewById(R.id.overview_newtempbasal_absolute_radio);
         typeSelectorLayout = (LinearLayout) view.findViewById(R.id.overview_newtempbasal_typeselector_layout);
 
-        PumpDescription pumpDescription = ConfigBuilderPlugin.getActivePump().getPumpDescription();
+        PumpDescription pumpDescription = ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription();
 
         basalPercent = (NumberPicker) view.findViewById(R.id.overview_newtempbasal_basalpercentinput);
         double maxTempPercent = pumpDescription.maxTempPercent;
@@ -163,9 +163,9 @@ public class NewTempBasalDialog extends DialogFragment implements View.OnClickLi
                                 }
                             };
                             if (setAsPercent) {
-                                ConfigBuilderPlugin.getCommandQueue().tempBasalPercent(finalBasalPercent, finalDurationInMinutes, true, profile, callback);
+                                ConfigBuilderPlugin.getPlugin().getCommandQueue().tempBasalPercent(finalBasalPercent, finalDurationInMinutes, true, profile, callback);
                             } else {
-                                ConfigBuilderPlugin.getCommandQueue().tempBasalAbsolute(finalBasal, finalDurationInMinutes, true, profile, callback);
+                                ConfigBuilderPlugin.getPlugin().getCommandQueue().tempBasalAbsolute(finalBasal, finalDurationInMinutes, true, profile, callback);
                             }
                             FabricPrivacy.getInstance().logCustom(new CustomEvent("TempBasal"));
                         }

app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalFragment.java

@@ -24,6 +24,7 @@ import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.events.EventCareportalEventChange;
 import info.nightscout.androidaps.plugins.Careportal.Dialogs.NewNSTreatmentDialog;
 import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
+import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.NSClientInternal.data.NSSettingsStatus;
 import info.nightscout.androidaps.plugins.Overview.OverviewFragment;
 import info.nightscout.utils.FabricPrivacy;
@@ -100,7 +101,7 @@ public class CareportalFragment extends SubscriberFragment implements View.OnCli
             noProfileView = view.findViewById(R.id.profileview_noprofile);
             butonsLayout = (LinearLayout) view.findViewById(R.id.careportal_buttons);
 
-            ProfileStore profileStore = MainApp.getConfigBuilder().getActiveProfileInterface() != null ? MainApp.getConfigBuilder().getActiveProfileInterface().getProfile() : null;
+            ProfileStore profileStore = ConfigBuilderPlugin.getPlugin().getActiveProfileInterface() != null ? ConfigBuilderPlugin.getPlugin().getActiveProfileInterface().getProfile() : null;
             if (profileStore == null) {
                 noProfileView.setVisibility(View.VISIBLE);
                 butonsLayout.setVisibility(View.GONE);

app/src/main/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialog.java

@@ -49,14 +49,15 @@ import info.nightscout.androidaps.db.ProfileSwitch;
 import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.db.TempTarget;
 import info.nightscout.androidaps.plugins.Careportal.OptionsToShow;
+import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
+import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
 import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.DefaultValueHelper;
 import info.nightscout.utils.FabricPrivacy;
 import info.nightscout.utils.HardLimits;
 import info.nightscout.utils.JsonHelper;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
 import info.nightscout.utils.NumberPicker;
 import info.nightscout.utils.SP;
 import info.nightscout.utils.SafeParse;
@@ -173,7 +174,7 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
 
         // profile
         profile = ProfileFunctions.getInstance().getProfile();
-        profileStore = MainApp.getConfigBuilder().getActiveProfileInterface().getProfile();
+        profileStore = ConfigBuilderPlugin.getPlugin().getActiveProfileInterface().getProfile();
         if (profileStore == null) {
             if (options.eventType == R.id.careportal_profileswitch) {
                 log.error("Profile switch called but plugin doesn't contain valid profile");
@@ -767,7 +768,7 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
         profileSwitch.source = Source.USER;
         profileSwitch.profileName = profileName;
         profileSwitch.profileJson = profileStore.getSpecificProfile(profileName).getData().toString();
-        profileSwitch.profilePlugin = MainApp.getConfigBuilder().getActiveProfileInterface().getClass().getName();
+        profileSwitch.profilePlugin = ConfigBuilderPlugin.getPlugin().getActiveProfileInterface().getClass().getName();
         profileSwitch.durationInMinutes = duration;
         profileSwitch.isCPP = percentage != 100 || timeshift != 0;
         profileSwitch.timeshift = timeshift;
@@ -789,7 +790,7 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
             profileSwitch.source = Source.USER;
             profileSwitch.profileName = ProfileFunctions.getInstance().getProfileName(System.currentTimeMillis(), false);
             profileSwitch.profileJson = ProfileFunctions.getInstance().getProfile().getData().toString();
-            profileSwitch.profilePlugin = MainApp.getConfigBuilder().getActiveProfileInterface().getClass().getName();
+            profileSwitch.profilePlugin = ConfigBuilderPlugin.getPlugin().getActiveProfileInterface().getClass().getName();
             profileSwitch.durationInMinutes = duration;
             profileSwitch.isCPP = percentage != 100 || timeshift != 0;
             profileSwitch.timeshift = timeshift;

app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java

@@ -19,7 +19,6 @@ import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.interfaces.ProfileInterface;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.interfaces.SensitivityInterface;
-import info.nightscout.androidaps.interfaces.TreatmentsInterface;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.Insulin.InsulinOrefRapidActingPlugin;
 import info.nightscout.androidaps.plugins.PumpVirtual.VirtualPumpPlugin;
@@ -42,16 +41,15 @@ public class ConfigBuilderPlugin extends PluginBase {
     }
 
     private BgSourceInterface activeBgSource;
-    private static PumpInterface activePump;
+    private PumpInterface activePump;
-    private static ProfileInterface activeProfile;
+    private ProfileInterface activeProfile;
-    private static TreatmentsInterface activeTreatments;
+    private APSInterface activeAPS;
-    private static APSInterface activeAPS;
+    private InsulinInterface activeInsulin;
-    private static InsulinInterface activeInsulin;
+    private SensitivityInterface activeSensitivity;
-    private static SensitivityInterface activeSensitivity;
 
-    private static ArrayList<PluginBase> pluginList;
+    private ArrayList<PluginBase> pluginList;
 
-    private static CommandQueue commandQueue = new CommandQueue();
+    private CommandQueue commandQueue = new CommandQueue();
 
     public ConfigBuilderPlugin() {
         super(new PluginDescription()
@@ -230,7 +228,7 @@ public class ConfigBuilderPlugin extends PluginBase {
         }
     }
 
-    public static CommandQueue getCommandQueue() {
+    public CommandQueue getCommandQueue() {
         return commandQueue;
     }
 
@@ -242,19 +240,19 @@ public class ConfigBuilderPlugin extends PluginBase {
         return activeProfile;
     }
 
-    public static InsulinInterface getActiveInsulin() {
+    public InsulinInterface getActiveInsulin() {
         return activeInsulin;
     }
 
-    public static APSInterface getActiveAPS() {
+    public APSInterface getActiveAPS() {
         return activeAPS;
     }
 
-    public static PumpInterface getActivePump() {
+    public PumpInterface getActivePump() {
         return activePump;
     }
 
-    public static SensitivityInterface getActiveSensitivity() {
+    public SensitivityInterface getActiveSensitivity() {
         return activeSensitivity;
     }
 
@@ -322,7 +320,6 @@ public class ConfigBuilderPlugin extends PluginBase {
         this.setFragmentVisiblities(((PluginBase) activePump).getName(), pluginsInCategory, PluginType.PUMP);
 
         // PluginType.TREATMENT
-        activeTreatments = this.determineActivePlugin(PluginType.TREATMENT);
     }
 
     /**

app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ProfileFunctions.java

@@ -49,7 +49,7 @@ public class ProfileFunctions {
     public void onProfileSwitch(EventProfileSwitchChange ignored) {
         if (L.isEnabled(L.PROFILE))
             log.debug("onProfileSwitch");
-        MainApp.getConfigBuilder().getCommandQueue().setProfile(getProfile(), new Callback() {
+        ConfigBuilderPlugin.getPlugin().getCommandQueue().setProfile(getProfile(), new Callback() {
             @Override
             public void run() {
                 if (!result.success) {
@@ -79,7 +79,7 @@ public class ProfileFunctions {
 
     public String getProfileName(long time, boolean customized) {
         TreatmentsInterface activeTreatments = TreatmentsPlugin.getPlugin();
-        ProfileInterface activeProfile = MainApp.getConfigBuilder().getActiveProfileInterface();
+        ProfileInterface activeProfile = ConfigBuilderPlugin.getPlugin().getActiveProfileInterface();
 
         ProfileSwitch profileSwitch = activeTreatments.getProfileSwitchFromHistory(time);
         if (profileSwitch != null) {
@@ -114,7 +114,7 @@ public class ProfileFunctions {
     @Nullable
     public Profile getProfile(long time) {
         TreatmentsInterface activeTreatments = TreatmentsPlugin.getPlugin();
-        ProfileInterface activeProfile = MainApp.getConfigBuilder().getActiveProfileInterface();
+        ProfileInterface activeProfile = ConfigBuilderPlugin.getPlugin().getActiveProfileInterface();
 
         //log.debug("Profile for: " + new Date(time).toLocaleString() + " : " + getProfileName(time));
         ProfileSwitch profileSwitch = activeTreatments.getProfileSwitchFromHistory(time);

app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/ObjectivesPlugin.java

@@ -65,7 +65,7 @@ public class ObjectivesPlugin extends PluginBase implements ConstraintsInterface
 
     @Override
     public boolean specialEnableCondition() {
-        PumpInterface pump = ConfigBuilderPlugin.getActivePump();
+        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
         return pump == null || pump.getPumpDescription().isTempBasalCapable;
     }
 

app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective1.java

@@ -68,7 +68,7 @@ public class Objective1 extends Objective {
         tasks.add(new Task(R.string.apsselected) {
             @Override
             public boolean isCompleted() {
-                APSInterface usedAPS = ConfigBuilderPlugin.getActiveAPS();
+                APSInterface usedAPS = ConfigBuilderPlugin.getPlugin().getActiveAPS();
                 if (usedAPS != null && ((PluginBase) usedAPS).isEnabled(PluginType.APS))
                     return true;
                 return false;

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

@@ -18,6 +18,7 @@ import info.nightscout.androidaps.plugins.OpenAPSMA.OpenAPSMAPlugin;
 import info.nightscout.androidaps.plugins.OpenAPSSMB.OpenAPSSMBPlugin;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
+import info.nightscout.androidaps.plugins.Sensitivity.SensitivityOref1Plugin;
 import info.nightscout.utils.DecimalFormatter;
 import info.nightscout.utils.HardLimits;
 import info.nightscout.utils.Round;
@@ -52,7 +53,7 @@ public class SafetyPlugin extends PluginBase implements ConstraintsInterface {
      **/
     @Override
     public Constraint<Boolean> isLoopInvocationAllowed(Constraint<Boolean> value) {
-        if (!ConfigBuilderPlugin.getActivePump().getPumpDescription().isTempBasalCapable)
+        if (!ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().isTempBasalCapable)
             value.set(false, MainApp.gs(R.string.pumpisnottempbasalcapable), this);
         return value;
     }
@@ -94,9 +95,20 @@ public class SafetyPlugin extends PluginBase implements ConstraintsInterface {
         return value;
     }
 
+    @Override
+    public Constraint<Boolean> isUAMEnabled(Constraint<Boolean> value) {
+        boolean enabled = SP.getBoolean(R.string.key_use_uam, false);
+        if (!enabled)
+            value.set(false, MainApp.gs(R.string.uamdisabledinpreferences), this);
+        boolean oref1Enabled = SensitivityOref1Plugin.getPlugin().isEnabled(PluginType.SENSITIVITY);
+        if (!oref1Enabled)
+            value.set(false, MainApp.gs(R.string.uamdisabledoref1notselected), this);
+        return value;
+    }
+
     @Override
     public Constraint<Boolean> isAdvancedFilteringEnabled(Constraint<Boolean> value) {
-        BgSourceInterface bgSource = MainApp.getConfigBuilder().getActiveBgSource();
+        BgSourceInterface bgSource = ConfigBuilderPlugin.getPlugin().getActiveBgSource();
 
         if (bgSource != null) {
             if (!bgSource.advancedFilteringSupported())
@@ -124,7 +136,7 @@ public class SafetyPlugin extends PluginBase implements ConstraintsInterface {
 
         absoluteRate.setIfSmaller(HardLimits.maxBasal(), String.format(MainApp.gs(R.string.limitingbasalratio), HardLimits.maxBasal(), MainApp.gs(R.string.hardlimit)), this);
 
-        PumpInterface pump = MainApp.getConfigBuilder().getActivePump();
+        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
         // check for pump max
         if (pump != null && pump.getPumpDescription().tempBasalStyle == PumpDescription.ABSOLUTE) {
             double pumpLimit = pump.getPumpDescription().pumpType.getTbrSettings().getMaxDose();
@@ -150,7 +162,7 @@ public class SafetyPlugin extends PluginBase implements ConstraintsInterface {
         applyBasalConstraints(absoluteConstraint, profile);
         percentRate.copyReasons(absoluteConstraint);
 
-        PumpInterface pump = MainApp.getConfigBuilder().getActivePump();
+        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
 
         Integer percentRateAfterConst = Double.valueOf(absoluteConstraint.value() / currentBasal * 100).intValue();
         if (pump != null) {
@@ -179,7 +191,7 @@ public class SafetyPlugin extends PluginBase implements ConstraintsInterface {
 
         insulin.setIfSmaller(HardLimits.maxBolus(), String.format(MainApp.gs(R.string.limitingbolus), HardLimits.maxBolus(), MainApp.gs(R.string.hardlimit)), this);
 
-        PumpInterface pump = MainApp.getConfigBuilder().getActivePump();
+        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
         if (pump != null) {
             double rounded = Round.roundTo(insulin.value(), pump.getPumpDescription().pumpType.determineCorrectBolusSize(insulin.value()));
             insulin.setIfDifferent(rounded, MainApp.gs(R.string.pumplimit), this);
@@ -196,7 +208,7 @@ public class SafetyPlugin extends PluginBase implements ConstraintsInterface {
 
         insulin.setIfSmaller(HardLimits.maxBolus(), String.format(MainApp.gs(R.string.limitingextendedbolus), HardLimits.maxBolus(), MainApp.gs(R.string.hardlimit)), this);
 
-        PumpInterface pump = MainApp.getConfigBuilder().getActivePump();
+        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
         if (pump != null) {
             double rounded = Round.roundTo(insulin.value(), pump.getPumpDescription().pumpType.determineCorrectExtendedBolusSize(insulin.value()));
             insulin.setIfDifferent(rounded, MainApp.gs(R.string.pumplimit), this);

app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinFragment.java

@@ -50,10 +50,10 @@ public class InsulinFragment extends Fragment {
     }
 
     private void updateGUI() {
-        insulinName.setText(ConfigBuilderPlugin.getActiveInsulin().getFriendlyName());
+        insulinName.setText(ConfigBuilderPlugin.getPlugin().getActiveInsulin().getFriendlyName());
-        insulinComment.setText(ConfigBuilderPlugin.getActiveInsulin().getComment());
+        insulinComment.setText(ConfigBuilderPlugin.getPlugin().getActiveInsulin().getComment());
-        insulinDia.setText(MainApp.gs(R.string.dia) + "  " + Double.toString(ConfigBuilderPlugin.getActiveInsulin().getDia()) + "h");
+        insulinDia.setText(MainApp.gs(R.string.dia) + "  " + Double.toString(ConfigBuilderPlugin.getPlugin().getActiveInsulin().getDia()) + "h");
-        insulinGraph.show(ConfigBuilderPlugin.getActiveInsulin());
+        insulinGraph.show(ConfigBuilderPlugin.getPlugin().getActiveInsulin());
     }
 
 }

app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/AutosensData.java

@@ -21,6 +21,7 @@ import info.nightscout.androidaps.plugins.Overview.graphExtensions.Scale;
 import info.nightscout.androidaps.plugins.Sensitivity.SensitivityAAPSPlugin;
 import info.nightscout.androidaps.plugins.Sensitivity.SensitivityWeightedAveragePlugin;
 import info.nightscout.androidaps.plugins.Treatments.Treatment;
+import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.SP;
 
 /**
@@ -40,7 +41,7 @@ public class AutosensData implements DataPointWithLabelInterface {
         double min5minCarbImpact = 0d;
         double remaining = 0d;
 
-        public CarbsInPast(Treatment t) {
+        CarbsInPast(Treatment t) {
             time = t.date;
             carbs = t.carbs;
             remaining = t.carbs;
@@ -56,6 +57,18 @@ public class AutosensData implements DataPointWithLabelInterface {
                 min5minCarbImpact = SP.getDouble(R.string.key_openapsama_min_5m_carbimpact, SMBDefaults.min_5m_carbimpact);
             }
         }
+
+       CarbsInPast (CarbsInPast other) {
+            this.time = other.time;
+            this.carbs = other.carbs;
+            this.min5minCarbImpact = other.min5minCarbImpact;
+            this.remaining = other.remaining;
+        }
+
+        @Override
+        public String toString() {
+            return String.format("CarbsInPast: time: %s carbs: %.02f min5minCI: %.02f remaining: %.2f", new Date(time).toLocaleString(), carbs, min5minCarbImpact, remaining);
+        }
     }
 
     public long time = 0L;
@@ -89,11 +102,18 @@ public class AutosensData implements DataPointWithLabelInterface {
 
     @Override
     public String toString() {
-        return "AutosensData: " + new Date(time).toLocaleString() + " " + pastSensitivity + " Delta=" + delta + " avgDelta=" + avgDelta + " Bgi=" + bgi + " Deviation=" + deviation + " avgDeviation=" + avgDeviation + " Absorbed=" + absorbed + " CarbsFromBolus=" + carbsFromBolus + " COB=" + cob + " autosensRatio=" + autosensResult.ratio + " slopeFromMaxDeviation=" + slopeFromMaxDeviation + " slopeFromMinDeviation=" + slopeFromMinDeviation;
+        return String.format("AutosensData: %s pastSensitivity=%s  delta=%.02f  avgDelta=%.02f bgi=%.02f deviation=%.02f avgDeviation=%.02f absorbed=%.02f carbsFromBolus=%.02f cob=%.02f autosensRatio=%.02f slopeFromMaxDeviation=%.02f slopeFromMinDeviation=%.02f activeCarbsList=%s",
+                new Date(time).toLocaleString(), pastSensitivity, delta, avgDelta, bgi, deviation, avgDeviation, absorbed, carbsFromBolus, cob, autosensResult.ratio, slopeFromMaxDeviation, slopeFromMinDeviation, activeCarbsList.toString());
     }
 
-    public int minOld() {
+    public List<CarbsInPast> cloneCarbsList() {
-        return (int) ((System.currentTimeMillis() - time) / 1000 / 60);
+        List<CarbsInPast> newActiveCarbsList = new ArrayList<>();
+
+        for(CarbsInPast c: activeCarbsList) {
+            newActiveCarbsList.add(new CarbsInPast(c));
+        }
+
+        return newActiveCarbsList;
     }
 
     // remove carbs older than timeframe
@@ -111,7 +131,7 @@ public class AutosensData implements DataPointWithLabelInterface {
                 if (c.remaining > 0)
                     cob -= c.remaining;
                 if (L.isEnabled(L.AUTOSENS))
-                    log.debug("Removing carbs at " + new Date(toTime).toLocaleString() + " + after " + maxAbsorptionHours + "h :" + new Date(c.time).toLocaleString());
+                    log.debug("Removing carbs at " + new Date(toTime).toLocaleString() + " after " + maxAbsorptionHours + "h > " + c.toString());
             }
         }
     }

app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/IobCobCalculatorPlugin.java

@@ -146,8 +146,8 @@ public class IobCobCalculatorPlugin extends PluginBase {
                     return false;
                 }
             }
-            double averageDiff = totalDiff / (bgReadings.size() - 1) / 1000d;
+            long averageDiff = totalDiff / bgReadings.size() / 1000;
-            boolean is5mindata = averageDiff < 10;
+            boolean is5mindata = averageDiff < 1;
             if (L.isEnabled(L.AUTOSENS))
                 log.debug("Interval detection: values: " + bgReadings.size() + " averageDiff: " + averageDiff + "[s] is5minData: " + is5mindata);
             return is5mindata;
@@ -231,13 +231,15 @@ public class IobCobCalculatorPlugin extends PluginBase {
 
         bucketed_data = new ArrayList<>();
         bucketed_data.add(bgReadings.get(0));
+        if (L.isEnabled(L.AUTOSENS))
+            log.debug("Adding. bgTime: " + DateUtil.toISOString(bgReadings.get(0).date) + " lastbgTime: " + "none-first-value" + " " + bgReadings.get(0).toString());
         int j = 0;
         for (int i = 1; i < bgReadings.size(); ++i) {
             long bgTime = bgReadings.get(i).date;
             long lastbgTime = bgReadings.get(i - 1).date;
             //log.error("Processing " + i + ": " + new Date(bgTime).toString() + " " + bgReadings.get(i).value + "   Previous: " + new Date(lastbgTime).toString() + " " + bgReadings.get(i - 1).value);
             if (bgReadings.get(i).value < 39 || bgReadings.get(i - 1).value < 39) {
-                continue;
+                throw new IllegalStateException("<39");
             }
 
             long elapsed_minutes = (bgTime - lastbgTime) / (60 * 1000);
@@ -294,6 +296,13 @@ public class IobCobCalculatorPlugin extends PluginBase {
             long adjusted = (msecDiff - T.mins(5).msecs()) / 1000;
             if (L.isEnabled(L.AUTOSENS))
                 log.debug("Adjusting bucketed data time. Current: " + DateUtil.toISOString(current.date) + " to: " + DateUtil.toISOString(previous.date + T.mins(5).msecs()) + " by " + adjusted + " sec");
+            if (Math.abs(adjusted) > 90) {
+                // too big adjustment, fallback to non 5 min data
+                if (L.isEnabled(L.AUTOSENS))
+                    log.debug("Fallback to non 5 min data");
+                createBucketedDataRecalculated();
+                return;
+            }
             current.date = previous.date + T.mins(5).msecs();
         }
 
@@ -530,7 +539,7 @@ public class IobCobCalculatorPlugin extends PluginBase {
 
     public AutosensResult detectSensitivityWithLock(long fromTime, long toTime) {
         synchronized (dataLock) {
-            return ConfigBuilderPlugin.getActiveSensitivity().detectSensitivity(this, fromTime, toTime);
+            return ConfigBuilderPlugin.getPlugin().getActiveSensitivity().detectSensitivity(this, fromTime, toTime);
         }
     }
 
@@ -597,7 +606,7 @@ public class IobCobCalculatorPlugin extends PluginBase {
                 log.debug("Ignoring event for non default instance");
             return;
         }
-        if (MainApp.getConfigBuilder() == null)
+        if (ConfigBuilderPlugin.getPlugin() == null)
             return; // app still initializing
         Profile profile = ProfileFunctions.getInstance().getProfile();
         if (profile == null)

app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/IobCobOref1Thread.java

@@ -26,6 +26,7 @@ import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.db.TempTarget;
 import info.nightscout.androidaps.events.Event;
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
 import info.nightscout.androidaps.plugins.IobCobCalculator.events.EventAutosensCalculationFinished;
 import info.nightscout.androidaps.plugins.IobCobCalculator.events.EventIobCalculationProgress;
@@ -35,6 +36,7 @@ import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Treatments.Treatment;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
 import info.nightscout.utils.DateUtil;
+import info.nightscout.utils.DecimalFormatter;
 import info.nightscout.utils.FabricPrivacy;
 import info.nightscout.utils.SP;
 
@@ -77,7 +79,7 @@ public class IobCobOref1Thread extends Thread {
         try {
             if (L.isEnabled(L.AUTOSENS))
                 log.debug("AUTOSENSDATA thread started: " + from);
-            if (MainApp.getConfigBuilder() == null) {
+            if (ConfigBuilderPlugin.getPlugin() == null) {
                 if (L.isEnabled(L.AUTOSENS))
                     log.debug("Aborting calculation thread (ConfigBuilder not ready): " + from);
                 return; // app still initializing
@@ -147,7 +149,7 @@ public class IobCobOref1Thread extends Thread {
                     AutosensData autosensData = new AutosensData();
                     autosensData.time = bgTime;
                     if (previous != null)
-                        autosensData.activeCarbsList = new ArrayList<>(previous.activeCarbsList);
+                        autosensData.activeCarbsList = previous.cloneCarbsList();
                     else
                         autosensData.activeCarbsList = new ArrayList<>();
 
@@ -241,6 +243,7 @@ public class IobCobOref1Thread extends Thread {
                     for (int ir = 0; ir < recentTreatments.size(); ir++) {
                         autosensData.carbsFromBolus += recentTreatments.get(ir).carbs;
                         autosensData.activeCarbsList.add(new AutosensData.CarbsInPast(recentTreatments.get(ir)));
+                        autosensData.pastSensitivity += "[" + DecimalFormatter.to0Decimal(recentTreatments.get(ir).carbs) + "g]";
                     }
 
 
@@ -338,19 +341,19 @@ public class IobCobOref1Thread extends Thread {
                     // Exclude meal-related deviations (carb absorption) from autosens
                     if (autosensData.type.equals("non-meal")) {
                         if (Math.abs(deviation) < Constants.DEVIATION_TO_BE_EQUAL) {
-                            autosensData.pastSensitivity = "=";
+                            autosensData.pastSensitivity += "=";
                             autosensData.validDeviation = true;
                         } else if (deviation > 0) {
-                            autosensData.pastSensitivity = "+";
+                            autosensData.pastSensitivity += "+";
                             autosensData.validDeviation = true;
                         } else {
-                            autosensData.pastSensitivity = "-";
+                            autosensData.pastSensitivity += "-";
                             autosensData.validDeviation = true;
                         }
                     } else if (autosensData.type.equals("uam")) {
-                        autosensData.pastSensitivity = "u";
+                        autosensData.pastSensitivity += "u";
                     } else {
-                        autosensData.pastSensitivity = "x";
+                        autosensData.pastSensitivity += "x";
                     }
                     //log.debug("TIME: " + new Date(bgTime).toString() + " BG: " + bg + " SENS: " + sens + " DELTA: " + delta + " AVGDELTA: " + avgDelta + " IOB: " + iob.iob + " ACTIVITY: " + iob.activity + " BGI: " + bgi + " DEVIATION: " + deviation);
 

app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/IobCobThread.java

@@ -24,6 +24,7 @@ import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.events.Event;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
 import info.nightscout.androidaps.plugins.IobCobCalculator.events.EventAutosensCalculationFinished;
 import info.nightscout.androidaps.plugins.IobCobCalculator.events.EventIobCalculationProgress;
@@ -35,6 +36,7 @@ import info.nightscout.androidaps.plugins.Sensitivity.SensitivityWeightedAverage
 import info.nightscout.androidaps.plugins.Treatments.Treatment;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
 import info.nightscout.utils.DateUtil;
+import info.nightscout.utils.DecimalFormatter;
 import info.nightscout.utils.FabricPrivacy;
 import info.nightscout.utils.SP;
 
@@ -76,7 +78,7 @@ public class IobCobThread extends Thread {
         try {
             if (L.isEnabled(L.AUTOSENS))
                 log.debug("AUTOSENSDATA thread started: " + from);
-            if (MainApp.getConfigBuilder() == null) {
+            if (ConfigBuilderPlugin.getPlugin() == null) {
                 if (L.isEnabled(L.AUTOSENS))
                     log.debug("Aborting calculation thread (ConfigBuilder not ready): " + from);
                 return; // app still initializing
@@ -146,7 +148,7 @@ public class IobCobThread extends Thread {
                     AutosensData autosensData = new AutosensData();
                     autosensData.time = bgTime;
                     if (previous != null)
-                        autosensData.activeCarbsList = new ArrayList<>(previous.activeCarbsList);
+                        autosensData.activeCarbsList = previous.cloneCarbsList();
                     else
                         autosensData.activeCarbsList = new ArrayList<>();
 
@@ -240,6 +242,7 @@ public class IobCobThread extends Thread {
                     for (int ir = 0; ir < recentTreatments.size(); ir++) {
                         autosensData.carbsFromBolus += recentTreatments.get(ir).carbs;
                         autosensData.activeCarbsList.add(new AutosensData.CarbsInPast(recentTreatments.get(ir)));
+                        autosensData.pastSensitivity += "[" + DecimalFormatter.to0Decimal(recentTreatments.get(ir).carbs) + "g]";
                     }
 
 
@@ -283,17 +286,17 @@ public class IobCobThread extends Thread {
                     // calculate autosens only without COB
                     if (autosensData.cob <= 0) {
                         if (Math.abs(deviation) < Constants.DEVIATION_TO_BE_EQUAL) {
-                            autosensData.pastSensitivity = "=";
+                            autosensData.pastSensitivity += "=";
                             autosensData.validDeviation = true;
                         } else if (deviation > 0) {
-                            autosensData.pastSensitivity = "+";
+                            autosensData.pastSensitivity += "+";
                             autosensData.validDeviation = true;
                         } else {
-                            autosensData.pastSensitivity = "-";
+                            autosensData.pastSensitivity += "-";
                             autosensData.validDeviation = true;
                         }
                     } else {
-                        autosensData.pastSensitivity = "C";
+                        autosensData.pastSensitivity += "C";
                     }
                     //log.debug("TIME: " + new Date(bgTime).toString() + " BG: " + bg + " SENS: " + sens + " DELTA: " + delta + " AVGDELTA: " + avgDelta + " IOB: " + iob.iob + " ACTIVITY: " + iob.activity + " BGI: " + bgi + " DEVIATION: " + deviation);
 

app/src/main/java/info/nightscout/androidaps/plugins/Loop/APSResult.java

@@ -86,7 +86,7 @@ public class APSResult {
 
     @Override
     public String toString() {
-        final PumpInterface pump = ConfigBuilderPlugin.getActivePump();
+        final PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
         if (isChangeRequested()) {
             String ret;
             // rate
@@ -115,7 +115,7 @@ public class APSResult {
     }
 
     public Spanned toSpanned() {
-        final PumpInterface pump = ConfigBuilderPlugin.getActivePump();
+        final PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
         if (isChangeRequested()) {
             String ret;
             // rate
@@ -304,7 +304,7 @@ public class APSResult {
 
         long now = System.currentTimeMillis();
         TemporaryBasal activeTemp = TreatmentsPlugin.getPlugin().getTempBasalFromHistory(now);
-        PumpInterface pump = MainApp.getConfigBuilder().getActivePump();
+        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
         Profile profile = ProfileFunctions.getInstance().getProfile();
 
         if (usePercent) {

app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopPlugin.java

@@ -140,7 +140,7 @@ public class LoopPlugin extends PluginBase {
 
     @Override
     public boolean specialEnableCondition() {
-        PumpInterface pump = ConfigBuilderPlugin.getActivePump();
+        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
         return pump == null || pump.getPumpDescription().isTempBasalCapable;
     }
 
@@ -275,7 +275,7 @@ public class LoopPlugin extends PluginBase {
                 MainApp.bus().post(new EventLoopSetLastRunGui(message));
                 return;
             }
-            final PumpInterface pump = ConfigBuilderPlugin.getActivePump();
+            final PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
             APSResult result = null;
 
             if (!isEnabled(PluginType.LOOP))
@@ -293,7 +293,7 @@ public class LoopPlugin extends PluginBase {
             // Check if pump info is loaded
             if (pump.getBaseBasalRate() < 0.01d) return;
 
-            APSInterface usedAPS = ConfigBuilderPlugin.getActiveAPS();
+            APSInterface usedAPS = ConfigBuilderPlugin.getPlugin().getActiveAPS();
             if (usedAPS != null && ((PluginBase) usedAPS).isEnabled(PluginType.APS)) {
                 usedAPS.invoke(initiator, tempBasalFallback);
                 result = usedAPS.getLastAPSResult();
@@ -358,8 +358,8 @@ public class LoopPlugin extends PluginBase {
 
             if (closedLoopEnabled.value()) {
                 if (resultAfterConstraints.isChangeRequested()
-                        && !ConfigBuilderPlugin.getCommandQueue().bolusInQueue()
+                        && !ConfigBuilderPlugin.getPlugin().getCommandQueue().bolusInQueue()
-                        && !ConfigBuilderPlugin.getCommandQueue().isRunning(Command.CommandType.BOLUS)) {
+                        && !ConfigBuilderPlugin.getPlugin().getCommandQueue().isRunning(Command.CommandType.BOLUS)) {
                     final PumpEnactResult waiting = new PumpEnactResult();
                     waiting.queued = true;
                     if (resultAfterConstraints.tempBasalRequested)
@@ -489,7 +489,7 @@ public class LoopPlugin extends PluginBase {
             return;
         }
 
-        PumpInterface pump = MainApp.getConfigBuilder().getActivePump();
+        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
         TreatmentsInterface activeTreatments = TreatmentsPlugin.getPlugin();
 
         if (!pump.isInitialized()) {
@@ -520,7 +520,7 @@ public class LoopPlugin extends PluginBase {
                 if (activeTemp != null) {
                     if (L.isEnabled(L.APS))
                         log.debug("applyAPSRequest: cancelTempBasal()");
-                    MainApp.getConfigBuilder().getCommandQueue().cancelTempBasal(false, callback);
+                    ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelTempBasal(false, callback);
                 } else {
                     if (L.isEnabled(L.APS))
                         log.debug("applyAPSRequest: Basal set correctly");
@@ -543,14 +543,14 @@ public class LoopPlugin extends PluginBase {
             } else {
                 if (L.isEnabled(L.APS))
                     log.debug("applyAPSRequest: tempBasalPercent()");
-                MainApp.getConfigBuilder().getCommandQueue().tempBasalPercent(request.percent, request.duration, false, profile, callback);
+                ConfigBuilderPlugin.getPlugin().getCommandQueue().tempBasalPercent(request.percent, request.duration, false, profile, callback);
             }
         } else {
             if ((request.rate == 0 && request.duration == 0) || Math.abs(request.rate - pump.getBaseBasalRate()) < pump.getPumpDescription().basalStep) {
                 if (activeTemp != null) {
                     if (L.isEnabled(L.APS))
                         log.debug("applyAPSRequest: cancelTempBasal()");
-                    MainApp.getConfigBuilder().getCommandQueue().cancelTempBasal(false, callback);
+                    ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelTempBasal(false, callback);
                 } else {
                     if (L.isEnabled(L.APS))
                         log.debug("applyAPSRequest: Basal set correctly");
@@ -573,7 +573,7 @@ public class LoopPlugin extends PluginBase {
             } else {
                 if (L.isEnabled(L.APS))
                     log.debug("applyAPSRequest: setTempBasalAbsolute()");
-                MainApp.getConfigBuilder().getCommandQueue().tempBasalAbsolute(request.rate, request.duration, false, profile, callback);
+                ConfigBuilderPlugin.getPlugin().getCommandQueue().tempBasalAbsolute(request.rate, request.duration, false, profile, callback);
             }
         }
     }
@@ -583,7 +583,7 @@ public class LoopPlugin extends PluginBase {
             return;
         }
 
-        PumpInterface pump = MainApp.getConfigBuilder().getActivePump();
+        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
         TreatmentsInterface activeTreatments = TreatmentsPlugin.getPlugin();
 
         long lastBolusTime = activeTreatments.getLastBolusTime();
@@ -629,15 +629,15 @@ public class LoopPlugin extends PluginBase {
         detailedBolusInfo.deliverAt = request.deliverAt;
         if (L.isEnabled(L.APS))
             log.debug("applyAPSRequest: bolus()");
-        MainApp.getConfigBuilder().getCommandQueue().bolus(detailedBolusInfo, callback);
+        ConfigBuilderPlugin.getPlugin().getCommandQueue().bolus(detailedBolusInfo, callback);
     }
 
     public void disconnectPump(int durationInMinutes, Profile profile) {
-        PumpInterface pump = MainApp.getConfigBuilder().getActivePump();
+        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
         TreatmentsInterface activeTreatments = TreatmentsPlugin.getPlugin();
 
         LoopPlugin.getPlugin().disconnectTo(System.currentTimeMillis() + durationInMinutes * 60 * 1000L);
-        MainApp.getConfigBuilder().getCommandQueue().tempBasalPercent(0, durationInMinutes, true, profile, new Callback() {
+        ConfigBuilderPlugin.getPlugin().getCommandQueue().tempBasalPercent(0, durationInMinutes, true, profile, new Callback() {
             @Override
             public void run() {
                 if (!result.success) {
@@ -646,7 +646,7 @@ public class LoopPlugin extends PluginBase {
             }
         });
         if (pump.getPumpDescription().isExtendedBolusCapable && activeTreatments.isInHistoryExtendedBoluslInProgress()) {
-            MainApp.getConfigBuilder().getCommandQueue().cancelExtended(new Callback() {
+            ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelExtended(new Callback() {
                 @Override
                 public void run() {
                     if (!result.success) {
@@ -660,7 +660,7 @@ public class LoopPlugin extends PluginBase {
 
     public void suspendLoop(int durationInMinutes) {
         LoopPlugin.getPlugin().suspendTo(System.currentTimeMillis() + durationInMinutes * 60 * 1000);
-        MainApp.getConfigBuilder().getCommandQueue().cancelTempBasal(true, new Callback() {
+        ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelTempBasal(true, new Callback() {
             @Override
             public void run() {
                 if (!result.success) {

app/src/main/java/info/nightscout/androidaps/plugins/Maintenance/MaintenancePlugin.java

@@ -73,8 +73,8 @@ public class MaintenancePlugin extends PluginBase {
     }
 
     public void sendLogs() {
-        String recipient = SP.getString("key_maintenance_logs_email", "logs@androidaps.org");
+        String recipient = SP.getString(R.string.key_maintenance_logs_email, "logs@androidaps.org");
-        int amount = SP.getInt("key_maintenance_logs_amount", 2);
+        int amount = SP.getInt(R.string.key_maintenance_logs_amount, 2);
 
         String logDirectory = LoggerUtils.getLogDirectory();
         List<File> logs = this.getLogfiles(logDirectory, amount);
@@ -103,7 +103,7 @@ public class MaintenancePlugin extends PluginBase {
         Arrays.sort(files, (f1, f2) -> f1.getName().compareTo(f2.getName()));
 
         List<File> delFiles = Arrays.asList(files);
-        int amount = SP.getInt("key_logshipper_amount", 2);
+        int amount = SP.getInt(R.string.key_logshipper_amount, 2);
         int keepIndex = amount - 1;
 
         if (keepIndex < delFiles.size()) {
@@ -213,6 +213,10 @@ public class MaintenancePlugin extends PluginBase {
         builder.append("ADD TIME OF EVENT HERE: " + System.lineSeparator());
         builder.append("ADD ISSUE DESCRIPTION OR GITHUB ISSUE REFERENCE NUMBER: " + System.lineSeparator());
         builder.append("-------------------------------------------------------" + System.lineSeparator());
+        builder.append("(Please remember this will send only very recent logs." + System.lineSeparator());
+        builder.append("If you want to provide logs for event older than a few hours," + System.lineSeparator());
+        builder.append("you have to do it manually)" + System.lineSeparator());
+        builder.append("-------------------------------------------------------" + System.lineSeparator());
         builder.append(MainApp.gs(R.string.app_name) + " " + BuildConfig.VERSION + System.lineSeparator());
         if (Config.NSCLIENT)
             builder.append("NSCLIENT" + System.lineSeparator());

app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/NSUpload.java

@@ -249,7 +249,7 @@ public class NSUpload {
                     log.debug("OpenAPS data too old to upload");
             }
             deviceStatus.device = "openaps://" + Build.MANUFACTURER + " " + Build.MODEL;
-            JSONObject pumpstatus = ConfigBuilderPlugin.getActivePump().getJSONStatus(profile, profileName);
+            JSONObject pumpstatus = ConfigBuilderPlugin.getPlugin().getActivePump().getJSONStatus(profile, profileName);
             if (pumpstatus != null) {
                 deviceStatus.pump = pumpstatus;
             }

app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAPlugin.java

@@ -67,13 +67,13 @@ public class OpenAPSAMAPlugin extends PluginBase implements APSInterface {
 
     @Override
     public boolean specialEnableCondition() {
-        PumpInterface pump = ConfigBuilderPlugin.getActivePump();
+        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
         return pump == null || pump.getPumpDescription().isTempBasalCapable;
     }
 
     @Override
     public boolean specialShowInListCondition() {
-        PumpInterface pump = ConfigBuilderPlugin.getActivePump();
+        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
         return pump == null || pump.getPumpDescription().isTempBasalCapable;
     }
 
@@ -97,7 +97,7 @@ public class OpenAPSAMAPlugin extends PluginBase implements APSInterface {
 
         GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
         Profile profile = ProfileFunctions.getInstance().getProfile();
-        PumpInterface pump = ConfigBuilderPlugin.getActivePump();
+        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
 
         if (profile == null) {
             MainApp.bus().post(new EventOpenAPSUpdateResultGui(MainApp.gs(R.string.noprofileselected)));
@@ -188,7 +188,7 @@ public class OpenAPSAMAPlugin extends PluginBase implements APSInterface {
         start = System.currentTimeMillis();
 
         try {
-            determineBasalAdapterAMAJS.setData(profile, maxIob, maxBasal, minBg, maxBg, targetBg, ConfigBuilderPlugin.getActivePump().getBaseBasalRate(), iobArray, glucoseStatus, mealData,
+            determineBasalAdapterAMAJS.setData(profile, maxIob, maxBasal, minBg, maxBg, targetBg, ConfigBuilderPlugin.getPlugin().getActivePump().getBaseBasalRate(), iobArray, glucoseStatus, mealData,
                     lastAutosensResult.ratio, //autosensDataRatio
                     isTempTarget
             );

app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAPlugin.java

@@ -66,13 +66,13 @@ public class OpenAPSMAPlugin extends PluginBase implements APSInterface {
 
     @Override
     public boolean specialEnableCondition() {
-        PumpInterface pump = ConfigBuilderPlugin.getActivePump();
+        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
         return pump == null || pump.getPumpDescription().isTempBasalCapable;
     }
 
     @Override
     public boolean specialShowInListCondition() {
-        PumpInterface pump = ConfigBuilderPlugin.getActivePump();
+        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
         return pump == null || pump.getPumpDescription().isTempBasalCapable;
     }
 
@@ -96,7 +96,7 @@ public class OpenAPSMAPlugin extends PluginBase implements APSInterface {
 
         GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
         Profile profile = ProfileFunctions.getInstance().getProfile();
-        PumpInterface pump = ConfigBuilderPlugin.getActivePump();
+        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
 
         if (profile == null) {
             MainApp.bus().post(new EventOpenAPSUpdateResultGui(MainApp.gs(R.string.noprofileselected)));
@@ -168,7 +168,7 @@ public class OpenAPSMAPlugin extends PluginBase implements APSInterface {
 
         start = System.currentTimeMillis();
         try {
-            determineBasalAdapterMAJS.setData(profile, maxIob, maxBasal, minBg, maxBg, targetBg, ConfigBuilderPlugin.getActivePump().getBaseBasalRate(), iobTotal, glucoseStatus, mealData);
+            determineBasalAdapterMAJS.setData(profile, maxIob, maxBasal, minBg, maxBg, targetBg, ConfigBuilderPlugin.getPlugin().getActivePump().getBaseBasalRate(), iobTotal, glucoseStatus, mealData);
         } catch (JSONException e) {
             log.error("Unhandled exception", e);
         }

app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/DetermineBasalAdapterSMBJS.java

@@ -211,6 +211,7 @@ public class DetermineBasalAdapterSMBJS {
                         double autosensDataRatio,
                         boolean tempTargetSet,
                         boolean microBolusAllowed,
+                        boolean uamAllowed,
                         boolean advancedFiltering
     ) throws JSONException {
 
@@ -247,7 +248,7 @@ public class DetermineBasalAdapterSMBJS {
         //    mProfile.put("min_5m_carbimpact", SP.getDouble(R.string.key_openapsama_min_5m_carbimpact, SMBDefaults.min_5m_carbimpact));
         //}
         mProfile.put("remainingCarbsCap", SMBDefaults.remainingCarbsCap);
-        mProfile.put("enableUAM", SP.getBoolean(R.string.key_use_uam, false));
+        mProfile.put("enableUAM", uamAllowed);
         mProfile.put("A52_risk_enable", SMBDefaults.A52_risk_enable);
         mProfile.put("enableSMB_with_COB", SP.getBoolean(R.string.key_enableSMB_with_COB, false));
         mProfile.put("enableSMB_with_temptarget", SP.getBoolean(R.string.key_enableSMB_with_temptarget, false));

app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/OpenAPSSMBPlugin.java

@@ -72,13 +72,13 @@ public class OpenAPSSMBPlugin extends PluginBase implements APSInterface {
 
     @Override
     public boolean specialEnableCondition() {
-        PumpInterface pump = ConfigBuilderPlugin.getActivePump();
+        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
         return pump == null || pump.getPumpDescription().isTempBasalCapable;
     }
 
     @Override
     public boolean specialShowInListCondition() {
-        PumpInterface pump = ConfigBuilderPlugin.getActivePump();
+        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
         return pump == null || pump.getPumpDescription().isTempBasalCapable;
     }
 
@@ -102,7 +102,7 @@ public class OpenAPSSMBPlugin extends PluginBase implements APSInterface {
 
         GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
         Profile profile = ProfileFunctions.getInstance().getProfile();
-        PumpInterface pump = ConfigBuilderPlugin.getActivePump();
+        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
 
         if (profile == null) {
             MainApp.bus().post(new EventOpenAPSUpdateResultGui(MainApp.gs(R.string.noprofileselected)));
@@ -198,6 +198,10 @@ public class OpenAPSSMBPlugin extends PluginBase implements APSInterface {
         MainApp.getConstraintChecker().isAdvancedFilteringEnabled(advancedFiltering);
         inputConstraints.copyReasons(advancedFiltering);
 
+        Constraint<Boolean> uam = new Constraint<>(true);
+        MainApp.getConstraintChecker().isUAMEnabled(uam);
+        inputConstraints.copyReasons(uam);
+
         if (L.isEnabled(L.APS))
             Profiler.log(log, "detectSensitivityandCarbAbsorption()", startPart);
         if (L.isEnabled(L.APS))
@@ -205,10 +209,11 @@ public class OpenAPSSMBPlugin extends PluginBase implements APSInterface {
 
         start = System.currentTimeMillis();
         try {
-            determineBasalAdapterSMBJS.setData(profile, maxIob, maxBasal, minBg, maxBg, targetBg, ConfigBuilderPlugin.getActivePump().getBaseBasalRate(), iobArray, glucoseStatus, mealData,
+            determineBasalAdapterSMBJS.setData(profile, maxIob, maxBasal, minBg, maxBg, targetBg, ConfigBuilderPlugin.getPlugin().getActivePump().getBaseBasalRate(), iobArray, glucoseStatus, mealData,
                     lastAutosensResult.ratio, //autosensDataRatio
                     isTempTarget,
                     smbAllowed.value(),
+                    uam.value(),
                     advancedFiltering.value()
             );
         } catch (JSONException e) {

app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/BolusProgressDialog.java

@@ -73,7 +73,7 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
         super.onResume();
         if (L.isEnabled(L.UI))
             log.debug("onResume");
-        if (!ConfigBuilderPlugin.getCommandQueue().bolusInQueue()) {
+        if (!ConfigBuilderPlugin.getPlugin().getCommandQueue().bolusInQueue()) {
             bolusEnded = true;
         }
         if (bolusEnded) {
@@ -123,7 +123,7 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
                 stopPressed = true;
                 stopPressedView.setVisibility(View.VISIBLE);
                 stopButton.setVisibility(View.INVISIBLE);
-                ConfigBuilderPlugin.getCommandQueue().cancelAllBoluses();
+                ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelAllBoluses();
                 break;
         }
     }

app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewInsulinDialog.java

@@ -133,7 +133,7 @@ public class NewInsulinDialog extends DialogFragment implements OnClickListener
         maxInsulin = MainApp.getConstraintChecker().getMaxBolusAllowed().value();
 
         editInsulin = view.findViewById(R.id.newinsulin_amount);
-        editInsulin.setParams(0d, 0d, maxInsulin, ConfigBuilderPlugin.getActivePump().getPumpDescription().bolusStep, DecimalFormatter.pumpSupportedBolusFormat(), false, textWatcher);
+        editInsulin.setParams(0d, 0d, maxInsulin, ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().bolusStep, DecimalFormatter.pumpSupportedBolusFormat(), false, textWatcher);
 
         Button plus1Button = view.findViewById(R.id.newinsulin_plus05);
         plus1Button.setOnClickListener(this);
@@ -212,7 +212,7 @@ public class NewInsulinDialog extends DialogFragment implements OnClickListener
 
         try {
             Profile currentProfile = ProfileFunctions.getInstance().getProfile();
-            final PumpInterface pump = MainApp.getConfigBuilder().getActivePump();
+            final PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
             if (currentProfile == null || pump == null)
                 return;
 
@@ -293,7 +293,7 @@ public class NewInsulinDialog extends DialogFragment implements OnClickListener
                                 TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, false);
                             } else {
                                 detailedBolusInfo.date = now();
-                                ConfigBuilderPlugin.getCommandQueue().bolus(detailedBolusInfo, new Callback() {
+                                ConfigBuilderPlugin.getPlugin().getCommandQueue().bolus(detailedBolusInfo, new Callback() {
                                     @Override
                                     public void run() {
                                         if (!result.success) {

app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java

@@ -105,7 +105,7 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
         editInsulin = (NumberPicker) view.findViewById(R.id.treatments_newtreatment_insulinamount);
 
         editCarbs.setParams(0d, 0d, (double) maxCarbs, 1d, new DecimalFormat("0"), false, textWatcher);
-        editInsulin.setParams(0d, 0d, maxInsulin, ConfigBuilderPlugin.getActivePump().getPumpDescription().bolusStep, DecimalFormatter.pumpSupportedBolusFormat(), false, textWatcher);
+        editInsulin.setParams(0d, 0d, maxInsulin, ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().bolusStep, DecimalFormatter.pumpSupportedBolusFormat(), false, textWatcher);
 
         recordOnlyCheckbox = (CheckBox) view.findViewById(R.id.newtreatment_record_only);
 
@@ -126,7 +126,7 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
                 okClicked = true;
 
                 try {
-                    final PumpInterface pump = MainApp.getConfigBuilder().getActivePump();
+                    final PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
 
                     if (pump == null)
                         return;
@@ -177,8 +177,8 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
                                     detailedBolusInfo.carbs = finalCarbsAfterConstraints;
                                     detailedBolusInfo.context = context;
                                     detailedBolusInfo.source = Source.USER;
-                                    if (!(recordOnlyCheckbox.isChecked() && (detailedBolusInfo.insulin > 0 || ConfigBuilderPlugin.getActivePump().getPumpDescription().storesCarbInfo))) {
+                                    if (!(recordOnlyCheckbox.isChecked() && (detailedBolusInfo.insulin > 0 || ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().storesCarbInfo))) {
-                                        ConfigBuilderPlugin.getCommandQueue().bolus(detailedBolusInfo, new Callback() {
+                                        ConfigBuilderPlugin.getPlugin().getCommandQueue().bolus(detailedBolusInfo, new Callback() {
                                             @Override
                                             public void run() {
                                                 if (!result.success) {

app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java

@@ -270,7 +270,7 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
 
         editBg.setParams(0d, 0d, 500d, 0.1d, new DecimalFormat("0.0"), false, textWatcher);
         editCarbs.setParams(0d, 0d, (double) maxCarbs, 1d, new DecimalFormat("0"), false, textWatcher);
-        double bolusstep = ConfigBuilderPlugin.getActivePump().getPumpDescription().bolusStep;
+        double bolusstep = ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().bolusStep;
         editCorr.setParams(0d, -maxCorrection, maxCorrection, bolusstep, DecimalFormatter.pumpSupportedBolusFormat(), false, textWatcher);
         editCarbTime.setParams(0d, -60d, 60d, 5d, new DecimalFormat("0"), false);
         initDialog();
@@ -327,7 +327,7 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
                 }
                 okClicked = true;
                 final Profile profile = ProfileFunctions.getInstance().getProfile();
-                final PumpInterface pump = MainApp.getConfigBuilder().getActivePump();
+                final PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
 
                 if (pump != null && profile != null && (calculatedTotalInsulin > 0d || calculatedCarbs > 0d)) {
                     String confirmMessage = MainApp.gs(R.string.entertreatmentquestion);
@@ -369,7 +369,7 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
                                             loopPlugin.superBolusTo(System.currentTimeMillis() + 2 * 60L * 60 * 1000);
                                             MainApp.bus().post(new EventRefreshOverview("WizardDialog"));
                                         }
-                                        ConfigBuilderPlugin.getCommandQueue().tempBasalPercent(0, 120, true, profile, new Callback() {
+                                        ConfigBuilderPlugin.getPlugin().getCommandQueue().tempBasalPercent(0, 120, true, profile, new Callback() {
                                             @Override
                                             public void run() {
                                                 if (!result.success) {
@@ -394,8 +394,8 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
                                     detailedBolusInfo.boluscalc = boluscalcJSON;
                                     detailedBolusInfo.source = Source.USER;
                                     detailedBolusInfo.notes = finalNotes;
-                                    if (detailedBolusInfo.insulin > 0 || ConfigBuilderPlugin.getActivePump().getPumpDescription().storesCarbInfo) {
+                                    if (detailedBolusInfo.insulin > 0 || ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().storesCarbInfo) {
-                                        ConfigBuilderPlugin.getCommandQueue().bolus(detailedBolusInfo, new Callback() {
+                                        ConfigBuilderPlugin.getPlugin().getCommandQueue().bolus(detailedBolusInfo, new Callback() {
                                             @Override
                                             public void run() {
                                                 if (!result.success) {
@@ -429,7 +429,7 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
 
     private void initDialog() {
         Profile profile = ProfileFunctions.getInstance().getProfile();
-        ProfileStore profileStore = MainApp.getConfigBuilder().getActiveProfileInterface() != null ? MainApp.getConfigBuilder().getActiveProfileInterface().getProfile() : null;
+        ProfileStore profileStore = ConfigBuilderPlugin.getPlugin().getActiveProfileInterface() != null ? ConfigBuilderPlugin.getPlugin().getActiveProfileInterface().getProfile() : null;
 
         if (profile == null || profileStore == null) {
             ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.gs(R.string.noprofile));
@@ -473,7 +473,7 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
     }
 
     private void calculateInsulin() {
-        ProfileStore profileStore = MainApp.getConfigBuilder().getActiveProfileInterface().getProfile();
+        ProfileStore profileStore = ConfigBuilderPlugin.getPlugin().getActiveProfileInterface().getProfile();
         if (profileSpinner == null || profileSpinner.getSelectedItem() == null || profileStore == null)
             return; // not initialized yet
         String selectedAlternativeProfile = profileSpinner.getSelectedItem().toString();

app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java

@@ -446,7 +446,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         super.onCreateContextMenu(menu, v, menuInfo);
         if (v == apsModeView) {
             final LoopPlugin loopPlugin = LoopPlugin.getPlugin();
-            final PumpDescription pumpDescription = ConfigBuilderPlugin.getActivePump().getPumpDescription();
+            final PumpDescription pumpDescription = ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription();
             if (!ProfileFunctions.getInstance().isProfileValid("ContexMenuCreation"))
                 return;
             menu.setHeaderTitle(MainApp.gs(R.string.loop));
@@ -473,7 +473,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         } else if (v == activeProfileView) {
             menu.setHeaderTitle(MainApp.gs(R.string.profile));
             menu.add(MainApp.gs(R.string.danar_viewprofile));
-            if (MainApp.getConfigBuilder().getActiveProfileInterface() != null && MainApp.getConfigBuilder().getActiveProfileInterface().getProfile() != null) {
+            if (ConfigBuilderPlugin.getPlugin().getActiveProfileInterface() != null && ConfigBuilderPlugin.getPlugin().getActiveProfileInterface().getProfile() != null) {
                 menu.add(MainApp.gs(R.string.careportal_profileswitch));
             }
         } else if (v == tempTargetView) {
@@ -497,9 +497,9 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         if (item.getTitle().equals(MainApp.gs(R.string.disableloop))) {
             loopPlugin.setPluginEnabled(PluginType.LOOP, false);
             loopPlugin.setFragmentVisible(PluginType.LOOP, false);
-            MainApp.getConfigBuilder().storeSettings("DisablingLoop");
+            ConfigBuilderPlugin.getPlugin().storeSettings("DisablingLoop");
             updateGUI("suspendmenu");
-            ConfigBuilderPlugin.getCommandQueue().cancelTempBasal(true, new Callback() {
+            ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelTempBasal(true, new Callback() {
                 @Override
                 public void run() {
                     if (!result.success) {
@@ -512,14 +512,14 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         } else if (item.getTitle().equals(MainApp.gs(R.string.enableloop))) {
             loopPlugin.setPluginEnabled(PluginType.LOOP, true);
             loopPlugin.setFragmentVisible(PluginType.LOOP, true);
-            MainApp.getConfigBuilder().storeSettings("EnablingLoop");
+            ConfigBuilderPlugin.getPlugin().storeSettings("EnablingLoop");
             updateGUI("suspendmenu");
             NSUpload.uploadOpenAPSOffline(0);
             return true;
         } else if (item.getTitle().equals(MainApp.gs(R.string.resume))) {
             loopPlugin.suspendTo(0L);
             updateGUI("suspendmenu");
-            ConfigBuilderPlugin.getCommandQueue().cancelTempBasal(true, new Callback() {
+            ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelTempBasal(true, new Callback() {
                 @Override
                 public void run() {
                     if (!result.success) {
@@ -681,8 +681,8 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 new NewCarbsDialog().show(manager, "CarbsDialog");
                 break;
             case R.id.overview_pumpstatus:
-                if (ConfigBuilderPlugin.getActivePump().isSuspended() || !ConfigBuilderPlugin.getActivePump().isInitialized())
+                if (ConfigBuilderPlugin.getPlugin().getActivePump().isSuspended() || !ConfigBuilderPlugin.getPlugin().getActivePump().isInitialized())
-                    ConfigBuilderPlugin.getCommandQueue().readStatus("RefreshClicked", null);
+                    ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("RefreshClicked", null);
                 break;
         }
 
@@ -815,7 +815,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                                     loopPlugin.superBolusTo(System.currentTimeMillis() + T.hours(2).msecs());
                                     MainApp.bus().post(new EventRefreshOverview("WizardDialog"));
                                 }
-                                ConfigBuilderPlugin.getCommandQueue().tempBasalPercent(0, 120, true, profile, new Callback() {
+                                ConfigBuilderPlugin.getPlugin().getCommandQueue().tempBasalPercent(0, 120, true, profile, new Callback() {
                                     @Override
                                     public void run() {
                                         if (!result.success) {
@@ -836,8 +836,8 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                             detailedBolusInfo.context = context;
                             detailedBolusInfo.boluscalc = boluscalcJSON;
                             detailedBolusInfo.source = Source.USER;
-                            if (finalInsulinAfterConstraints > 0 || ConfigBuilderPlugin.getActivePump().getPumpDescription().storesCarbInfo) {
+                            if (finalInsulinAfterConstraints > 0 || ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().storesCarbInfo) {
-                                ConfigBuilderPlugin.getCommandQueue().bolus(detailedBolusInfo, new Callback() {
+                                ConfigBuilderPlugin.getPlugin().getCommandQueue().bolus(detailedBolusInfo, new Callback() {
                                     @Override
                                     public void run() {
                                         if (!result.success) {
@@ -1043,7 +1043,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         BgReading actualBG = DatabaseHelper.actualBg();
         BgReading lastBG = DatabaseHelper.lastBg();
 
-        final PumpInterface pump = ConfigBuilderPlugin.getActivePump();
+        final PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
 
         final Profile profile = ProfileFunctions.getInstance().getProfile();
 
@@ -1248,7 +1248,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         // **** Various treatment buttons ****
         if (carbsButton != null) {
             if (SP.getBoolean(R.string.key_show_carbs_button, true)
-                    && (!ConfigBuilderPlugin.getActivePump().getPumpDescription().storesCarbInfo ||
+                    && (!ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().storesCarbInfo ||
                     (pump.isInitialized() && !pump.isSuspended()))) {
                 carbsButton.setVisibility(View.VISIBLE);
             } else {

app/src/main/java/info/nightscout/androidaps/plugins/Overview/graphData/GraphData.java

@@ -303,7 +303,7 @@ public class GraphData {
         }
 
         // Extended bolus
-        if (!ConfigBuilderPlugin.getActivePump().isFakingTempsByExtendedBoluses()) {
+        if (!ConfigBuilderPlugin.getPlugin().getActivePump().isFakingTempsByExtendedBoluses()) {
             List<ExtendedBolus> extendedBoluses = TreatmentsPlugin.getPlugin().getExtendedBolusesFromHistory().getList();
 
             for (int tx = 0; tx < extendedBoluses.size(); tx++) {

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

@@ -1,5 +1,9 @@
+
 package info.nightscout.androidaps.plugins.Overview.notifications;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.Date;
 
 import info.nightscout.androidaps.MainApp;
@@ -16,7 +20,6 @@ import info.nightscout.utils.SP;
  */
 
 public class Notification {
-
     public static final int URGENT = 0;
     public static final int NORMAL = 1;
     public static final int LOW = 2;
@@ -65,8 +68,9 @@ public class Notification {
     public static final int NSMALFUNCTION = 40;
     public static final int NEWVERSIONDETECTED = 41;
     public static final int SENDLOGFILES = 42;
-    public static final int RILEYLINK_CONNECTION = 43;
+    public static final int DEVICENOTPAIRED = 43;
     public static final int MEDTRONIC_PUMP_ALARM = 44;
+    public static final int RILEYLINK_CONNECTION = 45;
 
     public int id;
     public Date date;
@@ -76,12 +80,9 @@ public class Notification {
 
     public NSAlarm nsAlarm = null;
     public Integer soundId = null;
-
-
     public Notification() {
     }
 
-
     public Notification(int id, Date date, String text, int level, Date validTo) {
         this.id = id;
         this.date = date;
@@ -90,7 +91,6 @@ public class Notification {
         this.validTo = validTo;
     }
 
-
     public Notification(int id, String text, int level, int validMinutes) {
         this.id = id;
         this.date = new Date();
@@ -99,7 +99,6 @@ public class Notification {
         this.validTo = new Date(System.currentTimeMillis() + validMinutes * 60 * 1000L);
     }
 
-
     public Notification(int id, String text, int level) {
         this.id = id;
         this.date = new Date();
@@ -108,32 +107,27 @@ public class Notification {
         this.validTo = new Date(0);
     }
 
-
     public Notification(int id) {
         this.id = id;
         this.date = new Date();
         this.validTo = new Date(0);
     }
 
-
     public Notification text(String text) {
         this.text = text;
         return this;
     }
 
-
     public Notification level(int level) {
         this.level = level;
         return this;
     }
 
-
     public Notification sound(int soundId) {
         this.soundId = soundId;
         return this;
     }
 
-
     public Notification(NSAlarm nsAlarm) {
         this.date = new Date();
         this.validTo = new Date(0);
@@ -149,41 +143,32 @@ public class Notification {
                 this.id = NSALARM;
                 this.level = NORMAL;
                 this.text = nsAlarm.getTile();
-                if (isAlarmForLow() && SP.getBoolean(R.string.key_nsalarm_low, false) || isAlarmForHigh()
+                if (isAlarmForLow() && SP.getBoolean(R.string.key_nsalarm_low, false) || isAlarmForHigh() && SP.getBoolean(R.string.key_nsalarm_high, false) || isAlarmForStaleData() && SP.getBoolean(R.string.key_nsalarm_staledata, false))
-                    && SP.getBoolean(R.string.key_nsalarm_high, false) || isAlarmForStaleData()
-                    && SP.getBoolean(R.string.key_nsalarm_staledata, false))
                     this.soundId = R.raw.alarm;
                 break;
             case 2:
                 this.id = NSURGENTALARM;
                 this.level = URGENT;
                 this.text = nsAlarm.getTile();
-                if (isAlarmForLow() && SP.getBoolean(R.string.key_nsalarm_urgent_low, false) || isAlarmForHigh()
+                if (isAlarmForLow() && SP.getBoolean(R.string.key_nsalarm_urgent_low, false) || isAlarmForHigh() && SP.getBoolean(R.string.key_nsalarm_urgent_high, false))
-                    && SP.getBoolean(R.string.key_nsalarm_urgent_high, false))
                     this.soundId = R.raw.urgentalarm;
                 break;
         }
     }
 
-
     public boolean isEnabled() {
         if (nsAlarm == null)
             return true;
         if (level == ANNOUNCEMENT)
             return true;
-        if (level == NORMAL && isAlarmForLow() && SP.getBoolean(R.string.key_nsalarm_low, false) || isAlarmForHigh()
+        if (level == NORMAL && isAlarmForLow() && SP.getBoolean(R.string.key_nsalarm_low, false) || isAlarmForHigh() && SP.getBoolean(R.string.key_nsalarm_high, false) || isAlarmForStaleData() && SP.getBoolean(R.string.key_nsalarm_staledata, false)) {
-            && SP.getBoolean(R.string.key_nsalarm_high, false) || isAlarmForStaleData()
-            && SP.getBoolean(R.string.key_nsalarm_staledata, false)) {
             return true;
         }
-        if (level == URGENT && isAlarmForLow() && SP.getBoolean(R.string.key_nsalarm_urgent_low, false)
+        if (level == URGENT && isAlarmForLow() && SP.getBoolean(R.string.key_nsalarm_urgent_low, false) || isAlarmForHigh() && SP.getBoolean(R.string.key_nsalarm_urgent_high, false) || isAlarmForStaleData() && SP.getBoolean(R.string.key_nsalarm_urgent_staledata, false))
-            || isAlarmForHigh() && SP.getBoolean(R.string.key_nsalarm_urgent_high, false) || isAlarmForStaleData()
-            && SP.getBoolean(R.string.key_nsalarm_urgent_staledata, false))
             return true;
         return false;
     }
 
-
     boolean isAlarmForLow() {
         BgReading bgReading = MainApp.getDbHelper().lastBg();
         if (bgReading == null)
@@ -196,7 +181,6 @@ public class Notification {
         return false;
     }
 
-
     boolean isAlarmForHigh() {
         BgReading bgReading = MainApp.getDbHelper().lastBg();
         if (bgReading == null)
@@ -209,13 +193,11 @@ public class Notification {
         return false;
     }
 
-
+    public static boolean isAlarmForStaleData(){
-    public static boolean isAlarmForStaleData() {
         long snoozedTo = SP.getLong("snoozedTo", 0L);
-        if (snoozedTo != 0L) {
+        if(snoozedTo != 0L){
-            if (System.currentTimeMillis() < SP.getLong("snoozedTo", 0L)) {
+            if(System.currentTimeMillis() < SP.getLong("snoozedTo", 0L)) {
-                // log.debug("Alarm is snoozed for next "+(SP.getLong("snoozedTo",
+                //log.debug("Alarm is snoozed for next "+(SP.getLong("snoozedTo", 0L)-System.currentTimeMillis())/1000+" seconds");
-                // 0L)-System.currentTimeMillis())/1000+" seconds");
                 return false;
             }
         }
@@ -223,26 +205,24 @@ public class Notification {
         if (bgReading == null)
             return false;
         long bgReadingAgo = System.currentTimeMillis() - bgReading.date;
-        int bgReadingAgoMin = (int)(bgReadingAgo / (1000 * 60));
+        int bgReadingAgoMin = (int) (bgReadingAgo / (1000 * 60));
         // Added for testing
         // bgReadingAgoMin = 20;
         boolean openAPSEnabledAlerts = NSSettingsStatus.getInstance().openAPSEnabledAlerts();
-        // log.debug("bgReadingAgoMin value is:"+bgReadingAgoMin);
+        //log.debug("bgReadingAgoMin value is:"+bgReadingAgoMin);
-        // log.debug("Stale alarm snoozed to: "+(System.currentTimeMillis() - snoozedTo)/60000L);
+        //log.debug("Stale alarm snoozed to: "+(System.currentTimeMillis() - snoozedTo)/60000L);
         Double threshold = NSSettingsStatus.getInstance().getThreshold("alarmTimeagoWarnMins");
-        // log.debug("OpenAPS Alerts enabled: "+openAPSEnabledAlerts);
+	//log.debug("OpenAPS Alerts enabled: "+openAPSEnabledAlerts);
 	// if no thresshold from Ns get it loccally
-        if (threshold == null)
+        if(threshold == null) threshold = SP.getDouble(R.string.key_nsalarm_staledatavalue,15D);
-            threshold = SP.getDouble(R.string.key_nsalarm_staledatavalue, 15D);
 	// No threshold of OpenAPS Alarm so using the one for BG
 	// Added OpenAPSEnabledAlerts to alarm check
-        if ((bgReadingAgoMin > threshold && SP.getBoolean(R.string.key_nsalarm_staledata, false))
+        if((bgReadingAgoMin > threshold && SP.getBoolean(R.string.key_nsalarm_staledata, false))||(bgReadingAgoMin > threshold && openAPSEnabledAlerts)){
-            || (bgReadingAgoMin > threshold && openAPSEnabledAlerts)) {
             return true;
         }
-        // snoozing for threshold
+        //snoozing for threshold
-        SP.putLong("snoozedTo", (long)(bgReading.date + (threshold * 1000 * 60L)));
+        SP.putLong("snoozedTo", (long) (bgReading.date + (threshold * 1000 * 60L)));
-        // log.debug("New bg data is available Alarm is snoozed for next "+threshold*1000*60+" seconds");
+        //log.debug("New bg data is available Alarm is snoozed for next "+threshold*1000*60+" seconds");
         return false;
     }
 }

app/src/main/java/info/nightscout/androidaps/plugins/Persistentnotification/PersistentNotificationPlugin.java

@@ -109,7 +109,7 @@ public class PersistentNotificationPlugin extends PluginBase {
 
         String line1 = "";
 
-        if (MainApp.getConfigBuilder().getActiveProfileInterface() == null || !ProfileFunctions.getInstance().isProfileValid("Notificiation"))
+        if (ConfigBuilderPlugin.getPlugin().getActiveProfileInterface() == null || !ProfileFunctions.getInstance().isProfileValid("Notificiation"))
             return null;
         String units = ProfileFunctions.getInstance().getProfileUnits();
 
@@ -145,7 +145,7 @@ public class PersistentNotificationPlugin extends PluginBase {
 
         String line2 = MainApp.gs(R.string.treatments_iob_label_string) + " " +  DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U " + MainApp.gs(R.string.cob)+": " + IobCobCalculatorPlugin.getPlugin().getCobInfo(false, "PersistentNotificationPlugin").generateCOBString();;
         
-        String line3 = DecimalFormatter.to2Decimal(ConfigBuilderPlugin.getActivePump().getBaseBasalRate()) + " U/h";
+        String line3 = DecimalFormatter.to2Decimal(ConfigBuilderPlugin.getPlugin().getActivePump().getBaseBasalRate()) + " U/h";
 
 
         line3 += " - " + ProfileFunctions.getInstance().getProfileName();

app/src/main/java/info/nightscout/androidaps/plugins/ProfileLocal/LocalProfileFragment.java

@@ -79,7 +79,7 @@ public class LocalProfileFragment extends SubscriberFragment {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        PumpDescription pumpDescription = ConfigBuilderPlugin.getActivePump().getPumpDescription();
+        PumpDescription pumpDescription = ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription();
         View layout = inflater.inflate(R.layout.localprofile_fragment, container, false);
         diaView = (NumberPicker) layout.findViewById(R.id.localprofile_dia);
         diaView.setParams(LocalProfilePlugin.getPlugin().dia, 2d, 48d, 0.1d, new DecimalFormat("0.0"), false, textWatch);
@@ -96,7 +96,7 @@ public class LocalProfileFragment extends SubscriberFragment {
 
         invalidProfile = (TextView) layout.findViewById(R.id.invalidprofile);
 
-        if (!ConfigBuilderPlugin.getActivePump().getPumpDescription().isTempBasalCapable) {
+        if (!ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().isTempBasalCapable) {
             layout.findViewById(R.id.localprofile_basal).setVisibility(View.GONE);
         }
 

app/src/main/java/info/nightscout/androidaps/plugins/ProfileSimple/SimpleProfileFragment.java

@@ -55,7 +55,7 @@ public class SimpleProfileFragment extends SubscriberFragment {
         profileswitchButton = (Button) layout.findViewById(R.id.simpleprofile_profileswitch);
         invalidProfile = (TextView) layout.findViewById(R.id.invalidprofile);
 
-        if (!ConfigBuilderPlugin.getActivePump().getPumpDescription().isTempBasalCapable) {
+        if (!ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().isTempBasalCapable) {
             layout.findViewById(R.id.simpleprofile_basalrate).setVisibility(View.GONE);
             layout.findViewById(R.id.simpleprofile_basalrate_label).setVisibility(View.GONE);
         }
@@ -136,7 +136,7 @@ public class SimpleProfileFragment extends SubscriberFragment {
         if (activity != null)
             activity.runOnUiThread(() -> {
                 boolean isValid = SimpleProfilePlugin.getPlugin().getProfile() != null && SimpleProfilePlugin.getPlugin().getProfile().getDefaultProfile().isValid(MainApp.gs(R.string.simpleprofile));
-                if (!ConfigBuilderPlugin.getActivePump().isInitialized() || ConfigBuilderPlugin.getActivePump().isSuspended() || !isValid) {
+                if (!ConfigBuilderPlugin.getPlugin().getActivePump().isInitialized() || ConfigBuilderPlugin.getPlugin().getActivePump().isSuspended() || !isValid) {
                     profileswitchButton.setVisibility(View.GONE);
                 } else {
                     profileswitchButton.setVisibility(View.VISIBLE);

app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboFragment.java

@@ -77,7 +77,7 @@ public class ComboFragment extends SubscriberFragment implements View.OnClickLis
         switch (view.getId()) {
             case R.id.combo_refresh_button:
                 refreshButton.setEnabled(false);
-                ConfigBuilderPlugin.getCommandQueue().readStatus("User request", new Callback() {
+                ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("User request", new Callback() {
                     @Override
                     public void run() {
                         runOnUiThread(() -> refreshButton.setEnabled(true));
@@ -124,7 +124,7 @@ public class ComboFragment extends SubscriberFragment implements View.OnClickLis
                 activityView.setTextColor(Color.WHITE);
                 activityView.setTextSize(14);
                 activityView.setText(activity);
-            } else if (ConfigBuilderPlugin.getCommandQueue().size() > 0) {
+            } else if (ConfigBuilderPlugin.getPlugin().getCommandQueue().size() > 0) {
                 activityView.setTextColor(Color.WHITE);
                 activityView.setTextSize(14);
                 activityView.setText("");

app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java

@@ -653,11 +653,7 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
         }
     }
 
-    /**
+    /** Creates a treatment record based on the request in DetailBolusInfo and the delivered bolus. */
-     * Updates a DetailedBolusInfo from a pump bolus and adds it as a Treatment to the DB.
-     * Handles edge cases when dates aren't unique which are extremely unlikely to occur,
-     * but if they do, the user should be warned since a bolus will be missing from calculations.
-     */
     private boolean addBolusToTreatments(DetailedBolusInfo detailedBolusInfo, Bolus lastPumpBolus) {
         DetailedBolusInfo dbi = detailedBolusInfo.copy();
         dbi.date = calculateFakeBolusDate(lastPumpBolus);
@@ -665,15 +661,7 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
         dbi.source = Source.PUMP;
         dbi.insulin = lastPumpBolus.amount;
         try {
-            boolean treatmentCreated = TreatmentsPlugin.getPlugin().addToHistoryTreatment(dbi, false);
+            TreatmentsPlugin.getPlugin().addToHistoryTreatment(dbi, true);
-            if (!treatmentCreated) {
-                log.error("Adding treatment record overrode an existing record: " + dbi);
-                if (dbi.isSMB) {
-                    Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, MainApp.gs(R.string.combo_error_updating_treatment_record), Notification.URGENT);
-                    MainApp.bus().post(new EventNewNotification(notification));
-                }
-                return false;
-            }
         } catch (Exception e) {
             log.error("Adding treatment record failed", e);
             if (dbi.isSMB) {
@@ -898,7 +886,7 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
                             Notification.URGENT);
                     n.soundId = R.raw.alarm;
                     MainApp.bus().post(new EventNewNotification(n));
-                    ConfigBuilderPlugin.getCommandQueue().cancelTempBasal(true, null);
+                    ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelTempBasal(true, null);
                 }
                 updateLocalData(commandResult);
             }
@@ -1077,7 +1065,7 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
                 n.soundId = R.raw.alarm;
                 MainApp.bus().post(new EventNewNotification(n));
                 violationWarningRaisedForBolusAt = lowSuspendOnlyLoopEnforcedUntil;
-                ConfigBuilderPlugin.getCommandQueue().cancelTempBasal(true, null);
+                ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelTempBasal(true, null);
             }
         }
     }
@@ -1149,6 +1137,7 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
         return historyResult.success;
     }
 
+    /** Return value indicates whether a new record was created. */
     private boolean updateDbFromPumpHistory(@NonNull PumpHistory history) {
         boolean updated = false;
         for (Bolus pumpBolus : history.bolusHistory) {
@@ -1158,8 +1147,7 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
             dbi.source = Source.PUMP;
             dbi.insulin = pumpBolus.amount;
             dbi.eventType = CareportalEvent.CORRECTIONBOLUS;
-            if (TreatmentsPlugin.getPlugin().getService().getPumpRecordById(dbi.pumpId) == null) {
+            if (TreatmentsPlugin.getPlugin().addToHistoryTreatment(dbi, true)) {
-                TreatmentsPlugin.getPlugin().addToHistoryTreatment(dbi, false);
                 updated = true;
             }
         }

app/src/main/java/info/nightscout/androidaps/plugins/PumpCommon/defs/PumpType.java

@@ -38,7 +38,7 @@ public enum PumpType {
             new DoseSettings(0.1d, 15, 12*60, 0.1d), //
             PumpTempBasalType.Percent,
             new DoseSettings(10,  15, 12*60,0d, 500d), PumpCapability.BasalRate_Duration15and30minAllowed, //
-            0.01d, 0.1d, DoseStepSize.ComboBasal, PumpCapability.ComboCapabilities), //
+            0.01d, 0.01d, DoseStepSize.ComboBasal, PumpCapability.ComboCapabilities), //
 
     AccuChekSpirit("Accu-Chek Spirit", 0.1d, null, //
             new DoseSettings(0.1d, 15, 12*60, 0.1d), //
@@ -50,13 +50,13 @@ public enum PumpType {
             new DoseSettings(0.05d, 15, 24*60, 0.05d), //
             PumpTempBasalType.Percent,
             new DoseSettings(10,  15, 12*60,0d, 250d), PumpCapability.BasalRate_Duration15and30minAllowed, //
-            0.02d, 0.1d, null, PumpCapability.InsightCapabilities), //
+            0.02d, 0.01d, null, PumpCapability.InsightCapabilities), //
 
     // Animas
     AnimasVibe("Animas Vibe", 0.05d, null, // AnimasBolus?
             new DoseSettings(0.05d, 30, 12*60, 0.05d), //
             PumpTempBasalType.Percent, //
-            new DoseSettings(10, 30, 24*60, 0d, 200d), PumpCapability.BasalRate_Duration30minAllowed, //
+            new DoseSettings(10, 30, 24*60, 0d, 300d), PumpCapability.BasalRate_Duration30minAllowed, //
             0.025d, 5d, 0d, null, PumpCapability.VirtualPumpCapabilities), //
 
     AnimasPing("Animas Ping", AnimasVibe),

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRFragment.java

@@ -148,7 +148,7 @@ public class DanaRFragment extends SubscriberFragment {
         if (L.isEnabled(L.PUMP))
             log.debug("Clicked connect to pump");
         DanaRPump.getInstance().lastConnection = 0;
-        ConfigBuilderPlugin.getCommandQueue().readStatus("Clicked connect to pump", null);
+        ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("Clicked connect to pump", null);
     }
 
     @Subscribe
@@ -228,9 +228,9 @@ public class DanaRFragment extends SubscriberFragment {
 
                     dailyUnitsView.setText(DecimalFormatter.to0Decimal(pump.dailyTotalUnits) + " / " + pump.maxDailyTotalUnits + " U");
                     SetWarnColor.setColor(dailyUnitsView, pump.dailyTotalUnits, pump.maxDailyTotalUnits * 0.75d, pump.maxDailyTotalUnits * 0.9d);
-                    basaBasalRateView.setText("( " + (pump.activeProfile + 1) + " )  " + DecimalFormatter.to2Decimal(ConfigBuilderPlugin.getActivePump().getBaseBasalRate()) + " U/h");
+                    basaBasalRateView.setText("( " + (pump.activeProfile + 1) + " )  " + DecimalFormatter.to2Decimal(ConfigBuilderPlugin.getPlugin().getActivePump().getBaseBasalRate()) + " U/h");
                     // DanaRPlugin, DanaRKoreanPlugin
-                    if (ConfigBuilderPlugin.getActivePump().isFakingTempsByExtendedBoluses()) {
+                    if (ConfigBuilderPlugin.getPlugin().getActivePump().isFakingTempsByExtendedBoluses()) {
                         if (TreatmentsPlugin.getPlugin().isInHistoryRealTempBasalInProgress()) {
                             tempBasalView.setText(TreatmentsPlugin.getPlugin().getRealTempBasalFromHistory(System.currentTimeMillis()).toStringFull());
                         } else {
@@ -265,7 +265,7 @@ public class DanaRFragment extends SubscriberFragment {
                     bolusStepView.setText("" + pump.bolusStep);
                     serialNumberView.setText("" + pump.serialNumber);
                     if (queueView != null) {
-                        Spanned status = ConfigBuilderPlugin.getCommandQueue().spannedStatus();
+                        Spanned status = ConfigBuilderPlugin.getPlugin().getCommandQueue().spannedStatus();
                         if (status.toString().equals("")) {
                             queueView.setVisibility(View.GONE);
                         } else {

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPump.java

@@ -20,7 +20,7 @@ import info.nightscout.utils.SP;
  * Created by mike on 04.07.2016.
  */
 public class DanaRPump {
-    private Logger log = LoggerFactory.getLogger(L.PUMP);
+    private static Logger log = LoggerFactory.getLogger(L.PUMP);
 
     private static DanaRPump instance = null;
 
@@ -30,6 +30,7 @@ public class DanaRPump {
     }
 
     public static void reset() {
+        log.debug("DanaRPump reset");
         instance = null;
     }
 

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/Dialogs/ProfileViewDialog.java

@@ -55,7 +55,7 @@ public class ProfileViewDialog extends DialogFragment {
         refreshButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                ConfigBuilderPlugin.getCommandQueue().readStatus("ProfileViewDialog", null);
+                ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("ProfileViewDialog", null);
                 dismiss();
             }
         });
@@ -71,13 +71,13 @@ public class ProfileViewDialog extends DialogFragment {
     }
 
     private void setContent() {
-        ProfileStore store = ((ProfileInterface)MainApp.getConfigBuilder().getActivePump()).getProfile();
+        ProfileStore store = ((ProfileInterface)ConfigBuilderPlugin.getPlugin().getActivePump()).getProfile();
         if (store != null) {
             noProfile.setVisibility(View.GONE);
             Profile profile = store.getDefaultProfile();
             units.setText(profile.getUnits());
             dia.setText(DecimalFormatter.to2Decimal(profile.getDia()) + " h");
-            activeProfile.setText(((ProfileInterface) MainApp.getConfigBuilder().getActivePump()).getProfileName());
+            activeProfile.setText(((ProfileInterface) ConfigBuilderPlugin.getPlugin().getActivePump()).getProfileName());
             ic.setText(profile.getIcList());
             isf.setText(profile.getIsfList());
             basal.setText(profile.getBasalList());

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRHistoryActivity.java

@@ -148,7 +148,7 @@ public class DanaRHistoryActivity extends Activity {
                 statusView.setVisibility(View.VISIBLE);
             });
             clearCardView();
-            ConfigBuilderPlugin.getCommandQueue().loadHistory(selected.type, new Callback() {
+            ConfigBuilderPlugin.getPlugin().getCommandQueue().loadHistory(selected.type, new Callback() {
                 @Override
                 public void run() {
                     loadDataFromDB(selected.type);

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRUserOptionsActivity.java

@@ -20,6 +20,7 @@ import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.events.EventInitializationChanged;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
 import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
 import info.nightscout.androidaps.plugins.PumpDanaRS.DanaRSPlugin;
@@ -204,7 +205,7 @@ public class DanaRUserOptionsActivity extends Activity {
         } else
             pump.lowReservoirRate = 10;
 
-        MainApp.getConfigBuilder().getCommandQueue().setUserOptions(null);
+        ConfigBuilderPlugin.getPlugin().getCommandQueue().setUserOptions(null);
         finish();
     }
 

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgInitConnStatusTime.java

@@ -47,9 +47,9 @@ public class MsgInitConnStatusTime extends MessageBase {
                 (MainApp.getSpecificPlugin(DanaRKoreanPlugin.class)).setPluginEnabled(PluginType.PROFILE, true);
             }
 
-            MainApp.getConfigBuilder().storeSettings("ChangingDanaDriver");
+            ConfigBuilderPlugin.getPlugin().storeSettings("ChangingDanaDriver");
             MainApp.bus().post(new EventRefreshGui());
-            ConfigBuilderPlugin.getCommandQueue().readStatus("PumpDriverChange", null); // force new connection
+            ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("PumpDriverChange", null); // force new connection
             failed = false;
             return;
         } else {

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/AbstractDanaRExecutionService.java

@@ -40,6 +40,7 @@ import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgPCCommStart;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgPCCommStop;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.RecordTypes;
 import info.nightscout.androidaps.plugins.Treatments.Treatment;
+import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.SP;
 import info.nightscout.utils.ToastUtils;
 
@@ -55,7 +56,6 @@ public abstract class AbstractDanaRExecutionService extends Service {
     protected BluetoothSocket mRfcommSocket;
     protected BluetoothDevice mBTDevice;
 
-    protected DanaRPump mDanaRPump = DanaRPump.getInstance();
     protected Treatment mBolusingTreatment = null;
 
     protected boolean mConnectionInProgress = false;
@@ -237,4 +237,15 @@ public abstract class AbstractDanaRExecutionService extends Service {
         result.comment = "OK";
         return result;
     }
+
+    protected void waitForWholeMinute() {
+        while (true) {
+            long time = DateUtil.now();
+            long timeToWholeMinute = (60000 - time % 60000);
+            if (timeToWholeMinute > 59800 || timeToWholeMinute < 3000)
+                break;
+            MainApp.bus().post(new EventPumpStatusChanged(MainApp.gs(R.string.waitingfortimesynchronization, (int) (timeToWholeMinute / 1000))));
+            SystemClock.sleep(Math.min(timeToWholeMinute, 100));
+        }
+    }
 }

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/DanaRExecutionService.java

@@ -133,6 +133,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
     }
 
     public void getPumpStatus() {
+        DanaRPump danaRPump = DanaRPump.getInstance();
         try {
             MainApp.bus().post(new EventPumpStatusChanged(MainApp.gs(R.string.gettingpumpstatus)));
             MsgStatus statusMsg = new MsgStatus();
@@ -141,7 +142,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
             MsgStatusBolusExtended exStatusMsg = new MsgStatusBolusExtended();
             MsgCheckValue checkValue = new MsgCheckValue();
 
-            if (mDanaRPump.isNewPump) {
+            if (danaRPump.isNewPump) {
                 mSerialIOThread.sendMessage(checkValue);
                 if (!checkValue.received) {
                     return;
@@ -157,19 +158,19 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
             MainApp.bus().post(new EventPumpStatusChanged(MainApp.gs(R.string.gettingbolusstatus)));
 
             long now = System.currentTimeMillis();
-            mDanaRPump.lastConnection = now;
+            danaRPump.lastConnection = now;
 
             Profile profile = ProfileFunctions.getInstance().getProfile();
-            PumpInterface pump = MainApp.getConfigBuilder().getActivePump();
+            PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-            if (profile != null && Math.abs(mDanaRPump.currentBasal - profile.getBasal()) >= pump.getPumpDescription().basalStep) {
+            if (profile != null && Math.abs(danaRPump.currentBasal - profile.getBasal()) >= pump.getPumpDescription().basalStep) {
                 MainApp.bus().post(new EventPumpStatusChanged(MainApp.gs(R.string.gettingpumpsettings)));
                 mSerialIOThread.sendMessage(new MsgSettingBasal());
-                if (!pump.isThisProfileSet(profile) && !ConfigBuilderPlugin.getCommandQueue().isRunning(Command.CommandType.BASALPROFILE)) {
+                if (!pump.isThisProfileSet(profile) && !ConfigBuilderPlugin.getPlugin().getCommandQueue().isRunning(Command.CommandType.BASALPROFILE)) {
                     MainApp.bus().post(new EventProfileSwitchChange());
                 }
             }
 
-            if (mDanaRPump.lastSettingsRead + 60 * 60 * 1000L < now || !pump.isInitialized()) {
+            if (danaRPump.lastSettingsRead + 60 * 60 * 1000L < now || !pump.isInitialized()) {
                 MainApp.bus().post(new EventPumpStatusChanged(MainApp.gs(R.string.gettingpumpsettings)));
                 mSerialIOThread.sendMessage(new MsgSettingShippingInfo());
                 mSerialIOThread.sendMessage(new MsgSettingActiveProfile());
@@ -184,29 +185,29 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
                 mSerialIOThread.sendMessage(new MsgSettingUserOptions());
                 MainApp.bus().post(new EventPumpStatusChanged(MainApp.gs(R.string.gettingpumptime)));
                 mSerialIOThread.sendMessage(new MsgSettingPumpTime());
-                long timeDiff = (mDanaRPump.pumpTime - System.currentTimeMillis()) / 1000L;
+                long timeDiff = (danaRPump.pumpTime - System.currentTimeMillis()) / 1000L;
                 if (L.isEnabled(L.PUMP))
                     log.debug("Pump time difference: " + timeDiff + " seconds");
                 if (Math.abs(timeDiff) > 10) {
                     mSerialIOThread.sendMessage(new MsgSetTime(new Date()));
                     mSerialIOThread.sendMessage(new MsgSettingPumpTime());
-                    timeDiff = (mDanaRPump.pumpTime - System.currentTimeMillis()) / 1000L;
+                    timeDiff = (danaRPump.pumpTime - System.currentTimeMillis()) / 1000L;
                     if (L.isEnabled(L.PUMP))
                         log.debug("Pump time difference: " + timeDiff + " seconds");
                 }
-                mDanaRPump.lastSettingsRead = now;
+                danaRPump.lastSettingsRead = now;
             }
 
             MainApp.bus().post(new EventDanaRNewStatus());
             MainApp.bus().post(new EventInitializationChanged());
             NSUpload.uploadDeviceStatus();
-            if (mDanaRPump.dailyTotalUnits > mDanaRPump.maxDailyTotalUnits * Constants.dailyLimitWarning) {
+            if (danaRPump.dailyTotalUnits > danaRPump.maxDailyTotalUnits * Constants.dailyLimitWarning) {
                 if (L.isEnabled(L.PUMP))
-                    log.debug("Approaching daily limit: " + mDanaRPump.dailyTotalUnits + "/" + mDanaRPump.maxDailyTotalUnits);
+                    log.debug("Approaching daily limit: " + danaRPump.dailyTotalUnits + "/" + danaRPump.maxDailyTotalUnits);
                 if (System.currentTimeMillis() > lastApproachingDailyLimit + 30 * 60 * 1000) {
                     Notification reportFail = new Notification(Notification.APPROACHING_DAILY_LIMIT, MainApp.gs(R.string.approachingdailylimit), Notification.URGENT);
                     MainApp.bus().post(new EventNewNotification(reportFail));
-                    NSUpload.uploadError(MainApp.gs(R.string.approachingdailylimit) + ": " + mDanaRPump.dailyTotalUnits + "/" + mDanaRPump.maxDailyTotalUnits + "U");
+                    NSUpload.uploadError(MainApp.gs(R.string.approachingdailylimit) + ": " + danaRPump.dailyTotalUnits + "/" + danaRPump.maxDailyTotalUnits + "U");
                     lastApproachingDailyLimit = System.currentTimeMillis();
                 }
             }
@@ -216,8 +217,9 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
     }
 
     public boolean tempBasal(int percent, int durationInHours) {
+        DanaRPump danaRPump = DanaRPump.getInstance();
         if (!isConnected()) return false;
-        if (mDanaRPump.isTempBasalInProgress) {
+        if (danaRPump.isTempBasalInProgress) {
             MainApp.bus().post(new EventPumpStatusChanged(MainApp.gs(R.string.stoppingtempbasal)));
             mSerialIOThread.sendMessage(new MsgSetTempBasalStop());
             SystemClock.sleep(500);
@@ -262,6 +264,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
     }
 
     public boolean bolus(double amount, int carbs, long carbtime, final Treatment t) {
+        DanaRPump danaRPump = DanaRPump.getInstance();
         if (!isConnected()) return false;
         if (BolusProgressDialog.stopPressed) return false;
 
@@ -332,16 +335,16 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
 
                 final Object o = new Object();
                 synchronized (o) {
-                    ConfigBuilderPlugin.getCommandQueue().independentConnect("bolusingInterrupted", new Callback() {
+                    ConfigBuilderPlugin.getPlugin().getCommandQueue().independentConnect("bolusingInterrupted", new Callback() {
                         @Override
                         public void run() {
-                            if (mDanaRPump.lastBolusTime > System.currentTimeMillis() - 60 * 1000L) { // last bolus max 1 min old
+                            if (danaRPump.lastBolusTime > System.currentTimeMillis() - 60 * 1000L) { // last bolus max 1 min old
-                                t.insulin = mDanaRPump.lastBolusAmount;
+                                t.insulin = danaRPump.lastBolusAmount;
                                 if (L.isEnabled(L.PUMP))
-                                    log.debug("Used bolus amount from history: " + mDanaRPump.lastBolusAmount);
+                                    log.debug("Used bolus amount from history: " + danaRPump.lastBolusAmount);
                             } else {
                                 if (L.isEnabled(L.PUMP))
-                                    log.debug("Bolus amount in history too old: " + DateUtil.dateAndTimeFullString(mDanaRPump.lastBolusTime));
+                                    log.debug("Bolus amount in history too old: " + DateUtil.dateAndTimeFullString(danaRPump.lastBolusTime));
                             }
                             synchronized (o) {
                                 o.notify();
@@ -355,7 +358,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
                     }
                 }
             } else {
-                ConfigBuilderPlugin.getCommandQueue().readStatus("bolusOK", null);
+                ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("bolusOK", null);
             }
         }
         return !start.failed;
@@ -379,6 +382,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
     }
 
     public boolean updateBasalsInPump(final Profile profile) {
+        DanaRPump danaRPump = DanaRPump.getInstance();
         if (!isConnected()) return false;
         MainApp.bus().post(new EventPumpStatusChanged(MainApp.gs(R.string.updatingbasalrates)));
         double[] basal = DanaRPump.getInstance().buildDanaRProfileRecord(profile);
@@ -386,7 +390,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
         mSerialIOThread.sendMessage(msgSet);
         MsgSetActivateBasalProfile msgActivate = new MsgSetActivateBasalProfile((byte) 0);
         mSerialIOThread.sendMessage(msgActivate);
-        mDanaRPump.lastSettingsRead = 0; // force read full settings
+        danaRPump.lastSettingsRead = 0; // force read full settings
         getPumpStatus();
         MainApp.bus().post(new EventPumpStatusChanged(EventPumpStatusChanged.DISCONNECTING));
         return true;

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgInitConnStatusBolus_k.java

@@ -6,6 +6,7 @@ import org.slf4j.LoggerFactory;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
@@ -51,5 +52,9 @@ public class MsgInitConnStatusBolus_k extends MessageBase {
         } else {
             MainApp.bus().post(new EventDismissNotification(Notification.EXTENDED_BOLUS_DISABLED));
         }
+
+        // This is last message of initial sequence
+        if (ConfigBuilderPlugin.getPlugin().getActivePump() != null)
+            ConfigBuilderPlugin.getPlugin().getActivePump().finishHandshaking();
     }
 }

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgInitConnStatusTime_k.java

@@ -47,9 +47,9 @@ public class MsgInitConnStatusTime_k extends MessageBase {
                 (MainApp.getSpecificPlugin(DanaRPlugin.class)).setPluginEnabled(PluginType.PROFILE, true);
             }
 
-            MainApp.getConfigBuilder().storeSettings("ChangingKoreanDanaDriver");
+            ConfigBuilderPlugin.getPlugin().storeSettings("ChangingKoreanDanaDriver");
             MainApp.bus().post(new EventRefreshGui());
-            ConfigBuilderPlugin.getCommandQueue().readStatus("PumpDriverChange", null); // force new connection
+            ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("PumpDriverChange", null); // force new connection
             return;
         }
 

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/services/DanaRKoreanExecutionService.java

@@ -24,6 +24,7 @@ import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
+import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
 import info.nightscout.androidaps.plugins.Overview.Dialogs.BolusProgressDialog;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
@@ -55,8 +56,8 @@ import info.nightscout.androidaps.plugins.PumpDanaRKorean.comm.MsgSettingBasal_k
 import info.nightscout.androidaps.plugins.PumpDanaRKorean.comm.MsgStatusBasic_k;
 import info.nightscout.androidaps.plugins.Treatments.Treatment;
 import info.nightscout.androidaps.queue.commands.Command;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
+import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.SP;
+import info.nightscout.utils.T;
 
 public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
 
@@ -137,6 +138,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
     }
 
     public void getPumpStatus() {
+        DanaRPump danaRPump = DanaRPump.getInstance();
         try {
             MainApp.bus().post(new EventPumpStatusChanged(MainApp.gs(R.string.gettingpumpstatus)));
             //MsgStatus_k statusMsg = new MsgStatus_k();
@@ -145,7 +147,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
             MsgStatusBolusExtended exStatusMsg = new MsgStatusBolusExtended();
             MsgCheckValue_k checkValue = new MsgCheckValue_k();
 
-            if (mDanaRPump.isNewPump) {
+            if (danaRPump.isNewPump) {
                 mSerialIOThread.sendMessage(checkValue);
                 if (!checkValue.received) {
                     return;
@@ -161,19 +163,19 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
             MainApp.bus().post(new EventPumpStatusChanged(MainApp.gs(R.string.gettingbolusstatus)));
 
             long now = System.currentTimeMillis();
-            mDanaRPump.lastConnection = now;
+            danaRPump.lastConnection = now;
 
             Profile profile = ProfileFunctions.getInstance().getProfile();
-            PumpInterface pump = MainApp.getConfigBuilder().getActivePump();
+            PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-            if (profile != null && Math.abs(mDanaRPump.currentBasal - profile.getBasal()) >= pump.getPumpDescription().basalStep) {
+            if (profile != null && Math.abs(danaRPump.currentBasal - profile.getBasal()) >= pump.getPumpDescription().basalStep) {
                 MainApp.bus().post(new EventPumpStatusChanged(MainApp.gs(R.string.gettingpumpsettings)));
                 mSerialIOThread.sendMessage(new MsgSettingBasal());
-                if (!pump.isThisProfileSet(profile) && !ConfigBuilderPlugin.getCommandQueue().isRunning(Command.CommandType.BASALPROFILE)) {
+                if (!pump.isThisProfileSet(profile) && !ConfigBuilderPlugin.getPlugin().getCommandQueue().isRunning(Command.CommandType.BASALPROFILE)) {
                     MainApp.bus().post(new EventProfileSwitchChange());
                 }
             }
 
-            if (mDanaRPump.lastSettingsRead + 60 * 60 * 1000L < now || !pump.isInitialized()) {
+            if (danaRPump.lastSettingsRead + 60 * 60 * 1000L < now || !pump.isInitialized()) {
                 MainApp.bus().post(new EventPumpStatusChanged(MainApp.gs(R.string.gettingpumpsettings)));
                 mSerialIOThread.sendMessage(new MsgSettingShippingInfo());
                 mSerialIOThread.sendMessage(new MsgSettingMeal());
@@ -184,29 +186,31 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
                 mSerialIOThread.sendMessage(new MsgSettingProfileRatios());
                 MainApp.bus().post(new EventPumpStatusChanged(MainApp.gs(R.string.gettingpumptime)));
                 mSerialIOThread.sendMessage(new MsgSettingPumpTime());
-                long timeDiff = (mDanaRPump.pumpTime - System.currentTimeMillis()) / 1000L;
+                long timeDiff = (danaRPump.pumpTime - System.currentTimeMillis()) / 1000L;
                 if (L.isEnabled(L.PUMP))
                     log.debug("Pump time difference: " + timeDiff + " seconds");
                 if (Math.abs(timeDiff) > 10) {
-                    mSerialIOThread.sendMessage(new MsgSetTime(new Date()));
+                    waitForWholeMinute(); // Dana can set only whole minute
+                    // add 10sec to be sure we are over minute (will be cutted off anyway)
+                    mSerialIOThread.sendMessage(new MsgSetTime(new Date(DateUtil.now() + T.secs(10).msecs())));
                     mSerialIOThread.sendMessage(new MsgSettingPumpTime());
-                    timeDiff = (mDanaRPump.pumpTime - System.currentTimeMillis()) / 1000L;
+                    timeDiff = (danaRPump.pumpTime - System.currentTimeMillis()) / 1000L;
                     if (L.isEnabled(L.PUMP))
                         log.debug("Pump time difference: " + timeDiff + " seconds");
                 }
-                mDanaRPump.lastSettingsRead = now;
+                danaRPump.lastSettingsRead = now;
             }
 
             MainApp.bus().post(new EventDanaRNewStatus());
             MainApp.bus().post(new EventInitializationChanged());
             NSUpload.uploadDeviceStatus();
-            if (mDanaRPump.dailyTotalUnits > mDanaRPump.maxDailyTotalUnits * Constants.dailyLimitWarning) {
+            if (danaRPump.dailyTotalUnits > danaRPump.maxDailyTotalUnits * Constants.dailyLimitWarning) {
                 if (L.isEnabled(L.PUMP))
-                    log.debug("Approaching daily limit: " + mDanaRPump.dailyTotalUnits + "/" + mDanaRPump.maxDailyTotalUnits);
+                    log.debug("Approaching daily limit: " + danaRPump.dailyTotalUnits + "/" + danaRPump.maxDailyTotalUnits);
                 if (System.currentTimeMillis() > lastApproachingDailyLimit + 30 * 60 * 1000) {
                     Notification reportFail = new Notification(Notification.APPROACHING_DAILY_LIMIT, MainApp.gs(R.string.approachingdailylimit), Notification.URGENT);
                     MainApp.bus().post(new EventNewNotification(reportFail));
-                    NSUpload.uploadError(MainApp.gs(R.string.approachingdailylimit) + ": " + mDanaRPump.dailyTotalUnits + "/" + mDanaRPump.maxDailyTotalUnits + "U");
+                    NSUpload.uploadError(MainApp.gs(R.string.approachingdailylimit) + ": " + danaRPump.dailyTotalUnits + "/" + danaRPump.maxDailyTotalUnits + "U");
                     lastApproachingDailyLimit = System.currentTimeMillis();
                 }
             }
@@ -216,8 +220,9 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
     }
 
     public boolean tempBasal(int percent, int durationInHours) {
+        DanaRPump danaRPump = DanaRPump.getInstance();
         if (!isConnected()) return false;
-        if (mDanaRPump.isTempBasalInProgress) {
+        if (danaRPump.isTempBasalInProgress) {
             MainApp.bus().post(new EventPumpStatusChanged(MainApp.gs(R.string.stoppingtempbasal)));
             mSerialIOThread.sendMessage(new MsgSetTempBasalStop());
             SystemClock.sleep(500);
@@ -294,7 +299,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
             SystemClock.sleep(300);
 
             mBolusingTreatment = null;
-            ConfigBuilderPlugin.getCommandQueue().readStatus("bolusOK", null);
+            ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("bolusOK", null);
         }
 
         return !start.failed;
@@ -318,12 +323,13 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
     }
 
     public boolean updateBasalsInPump(final Profile profile) {
+        DanaRPump danaRPump = DanaRPump.getInstance();
         if (!isConnected()) return false;
         MainApp.bus().post(new EventPumpStatusChanged(MainApp.gs(R.string.updatingbasalrates)));
         double[] basal = DanaRPump.getInstance().buildDanaRProfileRecord(profile);
         MsgSetSingleBasalProfile msgSet = new MsgSetSingleBasalProfile(basal);
         mSerialIOThread.sendMessage(msgSet);
-        mDanaRPump.lastSettingsRead = 0; // force read full settings
+        danaRPump.lastSettingsRead = 0; // force read full settings
         getPumpStatus();
         MainApp.bus().post(new EventPumpStatusChanged(EventPumpStatusChanged.DISCONNECTING));
         return true;

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/DanaRSPlugin.java

@@ -415,6 +415,7 @@ public class DanaRSPlugin extends PluginBase implements PumpInterface, DanaRInte
             if (!result.success) {
                 String error = "" + DanaRS_Packet_Bolus_Set_Step_Bolus_Start.errorCode;
                 switch (DanaRS_Packet_Bolus_Set_Step_Bolus_Start.errorCode) {
+                    // 4 reported as max bolus violation. Check later
                     case 0x10:
                         error = MainApp.gs(R.string.maxbolusviolation);
                         break;

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/activities/PairingProgressDialog.java

@@ -51,8 +51,8 @@ public class PairingProgressDialog extends DialogFragment implements View.OnClic
                              Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.danars_pairingprogressdialog, container, false);
         getDialog().setTitle(MainApp.gs(R.string.pairing));
-        statusView = (TextView) view.findViewById(R.id.danars_paringprogress_status);
+        statusView = (TextView) view.findViewById(R.id.danars_pairingprogress_status);
-        progressBar = (ProgressBar) view.findViewById(R.id.danars_paringprogress_progressbar);
+        progressBar = (ProgressBar) view.findViewById(R.id.danars_pairingprogress_progressbar);
         button = (Button) view.findViewById(R.id.ok);
 
         progressBar.setMax(100);

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/BLEComm.java

@@ -662,7 +662,13 @@ public class BLEComm {
 
     private void SendPumpCheck() {
         // 1st message sent to pump after connect
-        byte[] bytes = BleCommandUtil.getInstance().getEncryptedPacket(BleCommandUtil.DANAR_PACKET__OPCODE_ENCRYPTION__PUMP_CHECK, null, getConnectDeviceName());
+        String devicename = getConnectDeviceName();
+        if(devicename == null || devicename == ""){
+            Notification n = new Notification(Notification.DEVICENOTPAIRED, MainApp.gs(R.string.pairfirst), Notification.URGENT);
+            MainApp.bus().post(new EventNewNotification(n));
+            return;
+        }
+        byte[] bytes = BleCommandUtil.getInstance().getEncryptedPacket(BleCommandUtil.DANAR_PACKET__OPCODE_ENCRYPTION__PUMP_CHECK, null, devicename);
         if (L.isEnabled(L.PUMPBTCOMM))
             log.debug(">>>>> " + "ENCRYPTION__PUMP_CHECK (0x00)" + " " + DanaRS_Packet.toHexString(bytes));
         writeCharacteristic_NO_RESPONSE(getUARTWriteBTGattChar(), bytes);

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/DanaRSService.java

@@ -144,11 +144,11 @@ public class DanaRSService extends Service {
             danaRPump.lastConnection = System.currentTimeMillis();
 
             Profile profile = ProfileFunctions.getInstance().getProfile();
-            PumpInterface pump = MainApp.getConfigBuilder().getActivePump();
+            PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
             if (profile != null && Math.abs(danaRPump.currentBasal - profile.getBasal()) >= pump.getPumpDescription().basalStep) {
                 MainApp.bus().post(new EventPumpStatusChanged(MainApp.gs(R.string.gettingpumpsettings)));
                 bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Basal_Rate()); // basal profile, basalStep, maxBasal
-                if (!pump.isThisProfileSet(profile) && !ConfigBuilderPlugin.getCommandQueue().isRunning(Command.CommandType.BASALPROFILE)) {
+                if (!pump.isThisProfileSet(profile) && !ConfigBuilderPlugin.getPlugin().getCommandQueue().isRunning(Command.CommandType.BASALPROFILE)) {
                     MainApp.bus().post(new EventProfileSwitchChange());
                 }
             }
@@ -331,7 +331,7 @@ public class DanaRSService extends Service {
             SystemClock.sleep(1000);
         }
         // do not call loadEvents() directly, reconnection may be needed
-        ConfigBuilderPlugin.getCommandQueue().loadEvents(new Callback() {
+        ConfigBuilderPlugin.getPlugin().getCommandQueue().loadEvents(new Callback() {
             @Override
             public void run() {
                 // reread bolus status

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgCheckValue_v2.java

@@ -59,9 +59,9 @@ public class MsgCheckValue_v2 extends MessageBase {
                 (MainApp.getSpecificPlugin(DanaRKoreanPlugin.class)).setPluginEnabled(PluginType.PROFILE, true);
             }
 
-            MainApp.getConfigBuilder().storeSettings("ChangingDanaRv2Driver");
+            ConfigBuilderPlugin.getPlugin().storeSettings("ChangingDanaRv2Driver");
             MainApp.bus().post(new EventRefreshGui());
-            ConfigBuilderPlugin.getCommandQueue().readStatus("PumpDriverChange", null); // force new connection
+            ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("PumpDriverChange", null); // force new connection
             return;
         }
 
@@ -82,9 +82,9 @@ public class MsgCheckValue_v2 extends MessageBase {
                 (MainApp.getSpecificPlugin(DanaRPlugin.class)).setPluginEnabled(PluginType.PROFILE, true);
             }
 
-            MainApp.getConfigBuilder().storeSettings("ChangingDanaRv2Driver");
+            ConfigBuilderPlugin.getPlugin().storeSettings("ChangingDanaRv2Driver");
             MainApp.bus().post(new EventRefreshGui());
-            ConfigBuilderPlugin.getCommandQueue().readStatus("PumpDriverChange", null); // force new connection
+            ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("PumpDriverChange", null); // force new connection
             return;
         }
         if (L.isEnabled(L.PUMPCOMM)) {

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java

@@ -25,6 +25,7 @@ import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
+import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
 import info.nightscout.androidaps.plugins.Overview.Dialogs.BolusProgressDialog;
 import info.nightscout.androidaps.plugins.Overview.Dialogs.ErrorHelperActivity;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
@@ -71,7 +72,6 @@ import info.nightscout.androidaps.plugins.Treatments.Treatment;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.androidaps.queue.commands.Command;
 import info.nightscout.utils.DateUtil;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
 import info.nightscout.utils.SP;
 import info.nightscout.utils.T;
 
@@ -156,6 +156,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
     }
 
     public void getPumpStatus() {
+        DanaRPump danaRPump = DanaRPump.getInstance();
         try {
             MainApp.bus().post(new EventPumpStatusChanged(MainApp.gs(R.string.gettingpumpstatus)));
             MsgStatus statusMsg = new MsgStatus();
@@ -164,7 +165,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
             MsgStatusBolusExtended_v2 exStatusMsg = new MsgStatusBolusExtended_v2();
             MsgCheckValue_v2 checkValue = new MsgCheckValue_v2();
 
-            if (mDanaRPump.isNewPump) {
+            if (danaRPump.isNewPump) {
                 mSerialIOThread.sendMessage(checkValue);
                 if (!checkValue.received) {
                     return;
@@ -179,21 +180,21 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
             MainApp.bus().post(new EventPumpStatusChanged(MainApp.gs(R.string.gettingextendedbolusstatus)));
             mSerialIOThread.sendMessage(exStatusMsg);
 
-            mDanaRPump.lastConnection = System.currentTimeMillis();
+            danaRPump.lastConnection = System.currentTimeMillis();
 
             Profile profile = ProfileFunctions.getInstance().getProfile();
-            PumpInterface pump = MainApp.getConfigBuilder().getActivePump();
+            PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-            if (profile != null && Math.abs(mDanaRPump.currentBasal - profile.getBasal()) >= pump.getPumpDescription().basalStep) {
+            if (profile != null && Math.abs(danaRPump.currentBasal - profile.getBasal()) >= pump.getPumpDescription().basalStep) {
                 MainApp.bus().post(new EventPumpStatusChanged(MainApp.gs(R.string.gettingpumpsettings)));
                 mSerialIOThread.sendMessage(new MsgSettingBasal());
-                if (!pump.isThisProfileSet(profile) && !ConfigBuilderPlugin.getCommandQueue().isRunning(Command.CommandType.BASALPROFILE)) {
+                if (!pump.isThisProfileSet(profile) && !ConfigBuilderPlugin.getPlugin().getCommandQueue().isRunning(Command.CommandType.BASALPROFILE)) {
                     MainApp.bus().post(new EventProfileSwitchChange());
                 }
             }
 
             MainApp.bus().post(new EventPumpStatusChanged(MainApp.gs(R.string.gettingpumptime)));
             mSerialIOThread.sendMessage(new MsgSettingPumpTime());
-            long timeDiff = (mDanaRPump.pumpTime - System.currentTimeMillis()) / 1000L;
+            long timeDiff = (danaRPump.pumpTime - System.currentTimeMillis()) / 1000L;
             if (L.isEnabled(L.PUMP))
                 log.debug("Pump time difference: " + timeDiff + " seconds");
             if (Math.abs(timeDiff) > 3) {
@@ -209,7 +210,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
                     MainApp.instance().startActivity(i);
 
                     //deinitialize pump
-                    mDanaRPump.lastConnection = 0;
+                    danaRPump.lastConnection = 0;
                     MainApp.bus().post(new EventDanaRNewStatus());
                     MainApp.bus().post(new EventInitializationChanged());
                     return;
@@ -218,14 +219,14 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
                     // add 10sec to be sure we are over minute (will be cutted off anyway)
                     mSerialIOThread.sendMessage(new MsgSetTime(new Date(DateUtil.now() + T.secs(10).msecs())));
                     mSerialIOThread.sendMessage(new MsgSettingPumpTime());
-                    timeDiff = (mDanaRPump.pumpTime - System.currentTimeMillis()) / 1000L;
+                    timeDiff = (danaRPump.pumpTime - System.currentTimeMillis()) / 1000L;
                     if (L.isEnabled(L.PUMP))
                         log.debug("Pump time difference: " + timeDiff + " seconds");
                 }
             }
 
             long now = System.currentTimeMillis();
-            if (mDanaRPump.lastSettingsRead + 60 * 60 * 1000L < now || !pump.isInitialized()) {
+            if (danaRPump.lastSettingsRead + 60 * 60 * 1000L < now || !pump.isInitialized()) {
                 MainApp.bus().post(new EventPumpStatusChanged(MainApp.gs(R.string.gettingpumpsettings)));
                 mSerialIOThread.sendMessage(new MsgSettingShippingInfo());
                 mSerialIOThread.sendMessage(new MsgSettingActiveProfile());
@@ -238,7 +239,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
                 mSerialIOThread.sendMessage(new MsgSettingProfileRatios());
                 mSerialIOThread.sendMessage(new MsgSettingUserOptions());
                 mSerialIOThread.sendMessage(new MsgSettingProfileRatiosAll());
-                mDanaRPump.lastSettingsRead = now;
+                danaRPump.lastSettingsRead = now;
             }
 
             loadEvents();
@@ -246,13 +247,13 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
             MainApp.bus().post(new EventDanaRNewStatus());
             MainApp.bus().post(new EventInitializationChanged());
             NSUpload.uploadDeviceStatus();
-            if (mDanaRPump.dailyTotalUnits > mDanaRPump.maxDailyTotalUnits * Constants.dailyLimitWarning) {
+            if (danaRPump.dailyTotalUnits > danaRPump.maxDailyTotalUnits * Constants.dailyLimitWarning) {
                 if (L.isEnabled(L.PUMP))
-                    log.debug("Approaching daily limit: " + mDanaRPump.dailyTotalUnits + "/" + mDanaRPump.maxDailyTotalUnits);
+                    log.debug("Approaching daily limit: " + danaRPump.dailyTotalUnits + "/" + danaRPump.maxDailyTotalUnits);
                 if (System.currentTimeMillis() > lastApproachingDailyLimit + 30 * 60 * 1000) {
                     Notification reportFail = new Notification(Notification.APPROACHING_DAILY_LIMIT, MainApp.gs(R.string.approachingdailylimit), Notification.URGENT);
                     MainApp.bus().post(new EventNewNotification(reportFail));
-                    NSUpload.uploadError(MainApp.gs(R.string.approachingdailylimit) + ": " + mDanaRPump.dailyTotalUnits + "/" + mDanaRPump.maxDailyTotalUnits + "U");
+                    NSUpload.uploadError(MainApp.gs(R.string.approachingdailylimit) + ": " + danaRPump.dailyTotalUnits + "/" + danaRPump.maxDailyTotalUnits + "U");
                     lastApproachingDailyLimit = System.currentTimeMillis();
                 }
             }
@@ -262,8 +263,9 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
     }
 
     public boolean tempBasal(int percent, int durationInHours) {
+        DanaRPump danaRPump = DanaRPump.getInstance();
         if (!isConnected()) return false;
-        if (mDanaRPump.isTempBasalInProgress) {
+        if (danaRPump.isTempBasalInProgress) {
             MainApp.bus().post(new EventPumpStatusChanged(MainApp.gs(R.string.stoppingtempbasal)));
             mSerialIOThread.sendMessage(new MsgSetTempBasalStop());
             SystemClock.sleep(500);
@@ -277,8 +279,9 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
     }
 
     public boolean highTempBasal(int percent) {
+        DanaRPump danaRPump = DanaRPump.getInstance();
         if (!isConnected()) return false;
-        if (mDanaRPump.isTempBasalInProgress) {
+        if (danaRPump.isTempBasalInProgress) {
             MainApp.bus().post(new EventPumpStatusChanged(MainApp.gs(R.string.stoppingtempbasal)));
             mSerialIOThread.sendMessage(new MsgSetTempBasalStop());
             SystemClock.sleep(500);
@@ -292,13 +295,14 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
     }
 
     public boolean tempBasalShortDuration(int percent, int durationInMinutes) {
+        DanaRPump danaRPump = DanaRPump.getInstance();
         if (durationInMinutes != 15 && durationInMinutes != 30) {
             log.error("Wrong duration param");
             return false;
         }
 
         if (!isConnected()) return false;
-        if (mDanaRPump.isTempBasalInProgress) {
+        if (danaRPump.isTempBasalInProgress) {
             MainApp.bus().post(new EventPumpStatusChanged(MainApp.gs(R.string.stoppingtempbasal)));
             mSerialIOThread.sendMessage(new MsgSetTempBasalStop());
             SystemClock.sleep(500);
@@ -409,7 +413,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
             SystemClock.sleep(1000);
         }
         // do not call loadEvents() directly, reconnection may be needed
-        ConfigBuilderPlugin.getCommandQueue().loadEvents(new Callback() {
+        ConfigBuilderPlugin.getPlugin().getCommandQueue().loadEvents(new Callback() {
             @Override
             public void run() {
                 // load last bolus status
@@ -449,6 +453,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
     }
 
     public PumpEnactResult loadEvents() {
+        DanaRPump danaRPump = DanaRPump.getInstance();
 
         if (!MainApp.getSpecificPlugin(DanaRv2Plugin.class).isInitialized()) {
             PumpEnactResult result = new PumpEnactResult().success(false);
@@ -479,11 +484,12 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
             lastHistoryFetched = MsgHistoryEvents_v2.lastEventTimeLoaded - T.mins(1).msecs();
         else
             lastHistoryFetched = 0;
-        mDanaRPump.lastConnection = System.currentTimeMillis();
+        danaRPump.lastConnection = System.currentTimeMillis();
         return new PumpEnactResult().success(true);
     }
 
     public boolean updateBasalsInPump(final Profile profile) {
+        DanaRPump danaRPump = DanaRPump.getInstance();
         if (!isConnected()) return false;
         MainApp.bus().post(new EventPumpStatusChanged(MainApp.gs(R.string.updatingbasalrates)));
         double[] basal = DanaRPump.getInstance().buildDanaRProfileRecord(profile);
@@ -491,23 +497,12 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         mSerialIOThread.sendMessage(msgSet);
         MsgSetActivateBasalProfile msgActivate = new MsgSetActivateBasalProfile((byte) 0);
         mSerialIOThread.sendMessage(msgActivate);
-        mDanaRPump.lastSettingsRead = 0; // force read full settings
+        danaRPump.lastSettingsRead = 0; // force read full settings
         getPumpStatus();
         MainApp.bus().post(new EventPumpStatusChanged(EventPumpStatusChanged.DISCONNECTING));
         return true;
     }
 
-    void waitForWholeMinute() {
-        while (true) {
-            long time = DateUtil.now();
-            long timeToWholeMinute = (60000 - time % 60000);
-            if (timeToWholeMinute > 59800 || timeToWholeMinute < 3000)
-                break;
-            MainApp.bus().post(new EventPumpStatusChanged(MainApp.gs(R.string.waitingfortimesynchronization, (int) (timeToWholeMinute / 1000))));
-            SystemClock.sleep(Math.min(timeToWholeMinute, 100));
-        }
-    }
-
     public PumpEnactResult setUserOptions() {
         if (!isConnected())
             return new PumpEnactResult().success(false);

app/src/main/java/info/nightscout/androidaps/plugins/PumpInsight/connector/Connector.java

@@ -18,6 +18,7 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.events.EventFeatureRunning;
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.PumpInsight.events.EventInsightUpdateGui;
 import info.nightscout.androidaps.plugins.PumpInsight.history.HistoryReceiver;
 import info.nightscout.androidaps.plugins.PumpInsight.history.LiveHistory;
@@ -459,7 +460,7 @@ public class Connector {
     public void tryToGetPumpStatusAgain() {
         if (Helpers.ratelimit("insight-retry-status-request", 5)) {
             try {
-                MainApp.getConfigBuilder().getCommandQueue().readStatus("Insight. Status missing", null);
+                ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("Insight. Status missing", null);
             } catch (NullPointerException e) {
                 //
             }

app/src/main/java/info/nightscout/androidaps/plugins/PumpMDI/MDIPlugin.java

@@ -115,7 +115,7 @@ public class MDIPlugin extends PluginBase implements PumpInterface {
 
     @Override
     public PumpEnactResult setNewBasalProfile(Profile profile) {
-        // Do nothing here. we are using MainApp.getConfigBuilder().getActiveProfile().getProfile();
+        // Do nothing here. we are using ConfigBuilderPlugin.getPlugin().getActiveProfile().getProfile();
         PumpEnactResult result = new PumpEnactResult();
         result.success = true;
         return result;

app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java

@@ -197,7 +197,7 @@ public class VirtualPumpPlugin extends PluginBase implements PumpInterface {
     @Override
     public PumpEnactResult setNewBasalProfile(Profile profile) {
         lastDataTime = System.currentTimeMillis();
-        // Do nothing here. we are using MainApp.getConfigBuilder().getActiveProfile().getProfile();
+        // Do nothing here. we are using ConfigBuilderPlugin.getPlugin().getActiveProfile().getProfile();
         PumpEnactResult result = new PumpEnactResult();
         result.success = true;
         Notification notification = new Notification(Notification.PROFILE_SET_OK, MainApp.gs(R.string.profile_set_ok), Notification.INFO, 60);

app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/SmsCommunicatorPlugin.java

@@ -242,7 +242,7 @@ public class SmsCommunicatorPlugin extends PluginBase {
                                 LoopPlugin loopPlugin = MainApp.getSpecificPlugin(LoopPlugin.class);
                                 if (loopPlugin != null && loopPlugin.isEnabled(PluginType.LOOP)) {
                                     loopPlugin.setPluginEnabled(PluginType.LOOP, false);
-                                    ConfigBuilderPlugin.getCommandQueue().cancelTempBasal(true, new Callback() {
+                                    ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelTempBasal(true, new Callback() {
                                         @Override
                                         public void run() {
                                             MainApp.bus().post(new EventRefreshOverview("SMS_LOOP_STOP"));
@@ -345,10 +345,10 @@ public class SmsCommunicatorPlugin extends PluginBase {
                     break;
                 case "PUMP":
                 case "DANAR":
-                    ConfigBuilderPlugin.getCommandQueue().readStatus("SMS", new Callback() {
+                    ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("SMS", new Callback() {
                         @Override
                         public void run() {
-                            PumpInterface pump = MainApp.getConfigBuilder().getActivePump();
+                            PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
                             if (result.success) {
                                 if (pump != null) {
                                     String reply = pump.shortStatus(true);
@@ -405,7 +405,7 @@ public class SmsCommunicatorPlugin extends PluginBase {
                     if (System.currentTimeMillis() - lastRemoteBolusTime.getTime() < Constants.remoteBolusMinDistance) {
                         reply = MainApp.gs(R.string.smscommunicator_remotebolusnotallowed);
                         sendSMS(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
-                    } else if (ConfigBuilderPlugin.getActivePump().isSuspended()) {
+                    } else if (ConfigBuilderPlugin.getPlugin().getActivePump().isSuspended()) {
                         reply = MainApp.gs(R.string.pumpsuspended);
                         sendSMS(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
                     } else if (splited.length > 1) {
@@ -449,10 +449,10 @@ public class SmsCommunicatorPlugin extends PluginBase {
                         DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo();
                         detailedBolusInfo.insulin = bolusWaitingForConfirmation.bolusRequested;
                         detailedBolusInfo.source = Source.USER;
-                        ConfigBuilderPlugin.getCommandQueue().bolus(detailedBolusInfo, new Callback() {
+                        ConfigBuilderPlugin.getPlugin().getCommandQueue().bolus(detailedBolusInfo, new Callback() {
                             @Override
                             public void run() {
-                                PumpInterface pump = MainApp.getConfigBuilder().getActivePump();
+                                PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
                                 if (result.success) {
                                     SystemClock.sleep(T.secs(15).msecs()); // wait some time to get history
                                     String reply = String.format(MainApp.gs(R.string.smscommunicator_bolusdelivered), result.bolusDelivered);
@@ -474,16 +474,16 @@ public class SmsCommunicatorPlugin extends PluginBase {
                         tempBasalWaitingForConfirmation.processed = true;
                         Profile profile = ProfileFunctions.getInstance().getProfile();
                         if (profile != null)
-                            ConfigBuilderPlugin.getCommandQueue().tempBasalAbsolute(tempBasalWaitingForConfirmation.tempBasal, 30, true, profile, new Callback() {
+                            ConfigBuilderPlugin.getPlugin().getCommandQueue().tempBasalAbsolute(tempBasalWaitingForConfirmation.tempBasal, 30, true, profile, new Callback() {
                                 @Override
                                 public void run() {
                                     if (result.success) {
                                         String reply = String.format(MainApp.gs(R.string.smscommunicator_tempbasalset), result.absolute, result.duration);
-                                        reply += "\n" + ConfigBuilderPlugin.getActivePump().shortStatus(true);
+                                        reply += "\n" + ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(true);
                                         sendSMSToAllNumbers(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
                                     } else {
                                         String reply = MainApp.gs(R.string.smscommunicator_tempbasalfailed);
-                                        reply += "\n" + ConfigBuilderPlugin.getActivePump().shortStatus(true);
+                                        reply += "\n" + ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(true);
                                         sendSMS(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
                                     }
                                 }
@@ -491,16 +491,16 @@ public class SmsCommunicatorPlugin extends PluginBase {
                     } else if (cancelTempBasalWaitingForConfirmation != null && !cancelTempBasalWaitingForConfirmation.processed &&
                             cancelTempBasalWaitingForConfirmation.confirmCode.equals(splited[0]) && System.currentTimeMillis() - cancelTempBasalWaitingForConfirmation.date < Constants.SMS_CONFIRM_TIMEOUT) {
                         cancelTempBasalWaitingForConfirmation.processed = true;
-                        ConfigBuilderPlugin.getCommandQueue().cancelTempBasal(true, new Callback() {
+                        ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelTempBasal(true, new Callback() {
                             @Override
                             public void run() {
                                 if (result.success) {
                                     String reply = MainApp.gs(R.string.smscommunicator_tempbasalcanceled);
-                                    reply += "\n" + ConfigBuilderPlugin.getActivePump().shortStatus(true);
+                                    reply += "\n" + ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(true);
                                     sendSMSToAllNumbers(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
                                 } else {
                                     String reply = MainApp.gs(R.string.smscommunicator_tempbasalcancelfailed);
-                                    reply += "\n" + ConfigBuilderPlugin.getActivePump().shortStatus(true);
+                                    reply += "\n" + ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(true);
                                     sendSMS(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
                                 }
                             }
@@ -519,19 +519,20 @@ public class SmsCommunicatorPlugin extends PluginBase {
                     } else if (suspendWaitingForConfirmation != null && !suspendWaitingForConfirmation.processed &&
                             suspendWaitingForConfirmation.confirmCode.equals(splited[0]) && System.currentTimeMillis() - suspendWaitingForConfirmation.date < Constants.SMS_CONFIRM_TIMEOUT) {
                         suspendWaitingForConfirmation.processed = true;
-                        ConfigBuilderPlugin.getCommandQueue().cancelTempBasal(true, new Callback() {
+                        final int dur =  suspendWaitingForConfirmation.duration;
+                        ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelTempBasal(true, new Callback() {
                             @Override
                             public void run() {
                                 if (result.success) {
-                                    LoopPlugin.getPlugin().suspendTo(System.currentTimeMillis() + suspendWaitingForConfirmation.duration * 60L * 1000);
+                                    LoopPlugin.getPlugin().suspendTo(System.currentTimeMillis() + dur * 60L * 1000);
-                                    NSUpload.uploadOpenAPSOffline(suspendWaitingForConfirmation.duration * 60);
+                                    NSUpload.uploadOpenAPSOffline(dur * 60);
                                     MainApp.bus().post(new EventRefreshOverview("SMS_LOOP_SUSPENDED"));
                                     String reply = MainApp.gs(R.string.smscommunicator_loopsuspended) + " " +
                                             MainApp.gs(result.success ? R.string.smscommunicator_tempbasalcanceled : R.string.smscommunicator_tempbasalcancelfailed);
                                     sendSMSToAllNumbers(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
                                 } else {
                                     String reply = MainApp.gs(R.string.smscommunicator_tempbasalcancelfailed);
-                                    reply += "\n" + ConfigBuilderPlugin.getActivePump().shortStatus(true);
+                                    reply += "\n" + ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(true);
                                     sendSMS(new Sms(receivedSms.phoneNumber, reply, System.currentTimeMillis()));
                                 }
                             }

app/src/main/java/info/nightscout/androidaps/plugins/Source/BGSourceFragment.java

@@ -15,9 +15,6 @@ import android.widget.TextView;
 
 import com.squareup.otto.Subscribe;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.List;
 
 import info.nightscout.androidaps.Constants;
@@ -26,6 +23,7 @@ import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.events.EventNewBG;
 import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
+import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
 import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.FabricPrivacy;
@@ -57,8 +55,8 @@ public class BGSourceFragment extends SubscriberFragment {
             RecyclerViewAdapter adapter = new RecyclerViewAdapter(MainApp.getDbHelper().getAllBgreadingsDataFromTime(now - MILLS_TO_THE_PAST, false));
             recyclerView.setAdapter(adapter);
 
-            if (MainApp.getConfigBuilder().getActiveProfileInterface() != null && MainApp.getConfigBuilder().getActiveProfileInterface().getProfile() != null && MainApp.getConfigBuilder().getActiveProfileInterface().getProfile().getDefaultProfile() != null)
+            if (ConfigBuilderPlugin.getPlugin().getActiveProfileInterface() != null && ConfigBuilderPlugin.getPlugin().getActiveProfileInterface().getProfile() != null && ConfigBuilderPlugin.getPlugin().getActiveProfileInterface().getProfile().getDefaultProfile() != null)
-                units = MainApp.getConfigBuilder().getActiveProfileInterface().getProfile().getDefaultProfile().getUnits();
+                units = ConfigBuilderPlugin.getPlugin().getActiveProfileInterface().getProfile().getDefaultProfile().getUnits();
 
             return view;
         } catch (Exception e) {

app/src/main/java/info/nightscout/androidaps/plugins/Treatments/CarbsGenerator.java

@@ -11,6 +11,7 @@ import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Overview.Dialogs.ErrorHelperActivity;
 import info.nightscout.androidaps.queue.Callback;
+import info.nightscout.utils.T;
 
 import static info.nightscout.utils.DateUtil.now;
 
@@ -35,8 +36,8 @@ public class CarbsGenerator {
         carbInfo.context = MainApp.instance();
         carbInfo.source = Source.USER;
         carbInfo.notes = notes;
-        if (ConfigBuilderPlugin.getActivePump().getPumpDescription().storesCarbInfo && carbInfo.date <= now()) {
+        if (ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().storesCarbInfo && carbInfo.date <= now() && carbInfo.date > now()- T.mins(2).msecs()) {
-            ConfigBuilderPlugin.getCommandQueue().bolus(carbInfo, new Callback() {
+            ConfigBuilderPlugin.getPlugin().getCommandQueue().bolus(carbInfo, new Callback() {
                 @Override
                 public void run() {
                     if (!result.success) {
@@ -50,6 +51,8 @@ public class CarbsGenerator {
                 }
             });
         } else {
+            // Don't send to pump if it is in the future or more than 5 minutes in the past
+            // as pumps might return those as as "now" when reading the history.
             TreatmentsPlugin.getPlugin().addToHistoryTreatment(carbInfo, false);
         }
     }

app/src/main/java/info/nightscout/androidaps/plugins/Treatments/Treatment.java

@@ -242,7 +242,7 @@ public class Treatment implements DataPointWithLabelInterface {
         if (!isValid)
             return new Iob();
 
-        InsulinInterface insulinInterface = ConfigBuilderPlugin.getActiveInsulin();
+        InsulinInterface insulinInterface = ConfigBuilderPlugin.getPlugin().getActiveInsulin();
         return insulinInterface.iobCalcForTreatment(this, time, dia);
     }
 }

app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsFragment.java

@@ -121,7 +121,7 @@ public class TreatmentsFragment extends SubscriberFragment implements View.OnCli
 
     @Override
     protected void updateGUI() {
-        if (ConfigBuilderPlugin.getActivePump().getPumpDescription().isExtendedBolusCapable
+        if (ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().isExtendedBolusCapable
                 || TreatmentsPlugin.getPlugin().getExtendedBolusesFromHistory().size() > 0) {
             extendedBolusesTab.setVisibility(View.VISIBLE);
         } else {

app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java

@@ -115,7 +115,7 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
         if (L.isEnabled(L.DATATREATMENTS))
             log.debug("initializeTreatmentData");
         double dia = Constants.defaultDIA;
-        if (MainApp.getConfigBuilder() != null && ProfileFunctions.getInstance().getProfile() != null)
+        if (ConfigBuilderPlugin.getPlugin() != null && ProfileFunctions.getInstance().getProfile() != null)
             dia = ProfileFunctions.getInstance().getProfile().getDia();
         long fromMills = (long) (System.currentTimeMillis() - 60 * 60 * 1000L * (24 + dia));
         synchronized (treatments) {
@@ -128,7 +128,7 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
         if (L.isEnabled(L.DATATREATMENTS))
             log.debug("initializeTempBasalData");
         double dia = Constants.defaultDIA;
-        if (MainApp.getConfigBuilder() != null && ProfileFunctions.getInstance().getProfile() != null)
+        if (ConfigBuilderPlugin.getPlugin() != null && ProfileFunctions.getInstance().getProfile() != null)
             dia = ProfileFunctions.getInstance().getProfile().getDia();
         long fromMills = (long) (System.currentTimeMillis() - 60 * 60 * 1000L * (24 + dia));
 
@@ -142,7 +142,7 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
         if (L.isEnabled(L.DATATREATMENTS))
             log.debug("initializeExtendedBolusData");
         double dia = Constants.defaultDIA;
-        if (MainApp.getConfigBuilder() != null && ProfileFunctions.getInstance().getProfile() != null)
+        if (ConfigBuilderPlugin.getPlugin() != null && ProfileFunctions.getInstance().getProfile() != null)
             dia = ProfileFunctions.getInstance().getProfile().getDia();
         long fromMills = (long) (System.currentTimeMillis() - 60 * 60 * 1000L * (24 + dia));
 
@@ -182,7 +182,7 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
         if (profile == null)
             return total;
 
-        InsulinInterface insulinInterface = MainApp.getConfigBuilder().getActiveInsulin();
+        InsulinInterface insulinInterface = ConfigBuilderPlugin.getPlugin().getActiveInsulin();
         if (insulinInterface == null)
             return  total;
 
@@ -209,7 +209,7 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
             }
         }
 
-        if (!ConfigBuilderPlugin.getActivePump().isFakingTempsByExtendedBoluses())
+        if (!ConfigBuilderPlugin.getPlugin().getActivePump().isFakingTempsByExtendedBoluses())
             synchronized (extendedBoluses) {
                 for (Integer pos = 0; pos < extendedBoluses.size(); pos++) {
                     ExtendedBolus e = extendedBoluses.get(pos);
@@ -370,7 +370,7 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
     public IobTotal getCalculationToTimeTempBasals(long time, Profile profile, boolean truncate, long truncateTime) {
         IobTotal total = new IobTotal(time);
 
-        InsulinInterface insulinInterface = MainApp.getConfigBuilder().getActiveInsulin();
+        InsulinInterface insulinInterface = ConfigBuilderPlugin.getPlugin().getActiveInsulin();
         if (insulinInterface == null)
             return  total;
 
@@ -391,7 +391,7 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
                 total.plus(calc);
             }
         }
-        if (ConfigBuilderPlugin.getActivePump().isFakingTempsByExtendedBoluses()) {
+        if (ConfigBuilderPlugin.getPlugin().getActivePump().isFakingTempsByExtendedBoluses()) {
             IobTotal totalExt = new IobTotal(time);
             synchronized (extendedBoluses) {
                 for (Integer pos = 0; pos < extendedBoluses.size(); pos++) {
@@ -433,7 +433,7 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
         if (tb != null)
             return tb;
         ExtendedBolus eb = getExtendedBolusFromHistory(time);
-        if (eb != null && ConfigBuilderPlugin.getActivePump().isFakingTempsByExtendedBoluses())
+        if (eb != null && ConfigBuilderPlugin.getPlugin().getActivePump().isFakingTempsByExtendedBoluses())
             return new TemporaryBasal(eb);
         return null;
     }
@@ -451,11 +451,11 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
         boolean newRecordCreated = MainApp.getDbHelper().createOrUpdate(extendedBolus);
         if (newRecordCreated) {
             if (extendedBolus.durationInMinutes == 0) {
-                if (MainApp.getConfigBuilder().getActivePump().isFakingTempsByExtendedBoluses())
+                if (ConfigBuilderPlugin.getPlugin().getActivePump().isFakingTempsByExtendedBoluses())
                     NSUpload.uploadTempBasalEnd(extendedBolus.date, true, extendedBolus.pumpId);
                 else
                     NSUpload.uploadExtendedBolusEnd(extendedBolus.date, extendedBolus.pumpId);
-            } else if (MainApp.getConfigBuilder().getActivePump().isFakingTempsByExtendedBoluses())
+            } else if (ConfigBuilderPlugin.getPlugin().getActivePump().isFakingTempsByExtendedBoluses())
                 NSUpload.uploadTempBasalStartAbsolute(new TemporaryBasal(extendedBolus), extendedBolus.insulin);
             else
                 NSUpload.uploadExtendedBolus(extendedBolus);

app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java

@@ -295,7 +295,7 @@ public class ActionStringHandler {
             }
 
         } else if ("tddstats".equals(act[0])) {
-            Object activePump = MainApp.getConfigBuilder().getActivePump();
+            Object activePump = ConfigBuilderPlugin.getPlugin().getActivePump();
             if (activePump != null) {
                 // check if DB up to date
                 List<TDD> dummies = new LinkedList<TDD>();
@@ -307,13 +307,13 @@ public class ActionStringHandler {
                     rMessage = "OLD DATA - ";
 
                     //if pump is not busy: try to fetch data
-                    final PumpInterface pump = MainApp.getConfigBuilder().getActivePump();
+                    final PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
                     if (pump.isBusy()) {
                         rMessage += MainApp.gs(R.string.pumpbusy);
                     } else {
                         rMessage += "trying to fetch data from pump.";
 
-                        ConfigBuilderPlugin.getCommandQueue().loadTDDs(new Callback() {
+                        ConfigBuilderPlugin.getPlugin().getCommandQueue().loadTDDs(new Callback() {
                             @Override
                             public void run() {
                                 List<TDD> dummies = new LinkedList<TDD>();
@@ -398,7 +398,7 @@ public class ActionStringHandler {
 
         double refTDD = profile.baseBasalSum() * 2;
 
-        PumpInterface pump = MainApp.getConfigBuilder().getActivePump();
+        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
         if (df.format(new Date(historyList.get(0).date)).equals(df.format(new Date()))) {
             double tdd = historyList.get(0).getTotal();
             historyList.remove(0);
@@ -447,7 +447,7 @@ public class ActionStringHandler {
     }
 
     public static boolean isOldData(List<TDD> historyList) {
-        Object activePump = MainApp.getConfigBuilder().getActivePump();
+        Object activePump = ConfigBuilderPlugin.getPlugin().getActivePump();
         PumpInterface dana = MainApp.getSpecificPlugin(DanaRPlugin.class);
         PumpInterface danaRS = MainApp.getSpecificPlugin(DanaRSPlugin.class);
         PumpInterface danaV2 = MainApp.getSpecificPlugin(DanaRv2Plugin.class);
@@ -498,7 +498,7 @@ public class ActionStringHandler {
 
     @NonNull
     private static String getPumpStatus() {
-        return ConfigBuilderPlugin.getActivePump().shortStatus(false);
+        return ConfigBuilderPlugin.getPlugin().getActivePump().shortStatus(false);
     }
 
     @NonNull
@@ -512,7 +512,7 @@ public class ActionStringHandler {
             } else {
                 ret += "OPEN LOOP\n";
             }
-            final APSInterface aps = ConfigBuilderPlugin.getActiveAPS();
+            final APSInterface aps = ConfigBuilderPlugin.getPlugin().getActiveAPS();
             ret += "APS: " + ((aps == null) ? "NO APS SELECTED!" : ((PluginBase) aps).getName());
             if (LoopPlugin.lastRun != null) {
                 if (LoopPlugin.lastRun.lastAPSRun != null)
@@ -566,7 +566,7 @@ public class ActionStringHandler {
             return "No profile set :(";
         }
 
-        APSInterface usedAPS = ConfigBuilderPlugin.getActiveAPS();
+        APSInterface usedAPS = ConfigBuilderPlugin.getPlugin().getActiveAPS();
         if (usedAPS == null) {
             return "No active APS :(!";
         }
@@ -582,7 +582,7 @@ public class ActionStringHandler {
             ret += MainApp.gs(R.string.canceltemp) + "\n";
         } else {
             ret += MainApp.gs(R.string.rate) + ": " + DecimalFormatter.to2Decimal(result.rate) + " U/h " +
-                    "(" + DecimalFormatter.to2Decimal(result.rate / ConfigBuilderPlugin.getActivePump().getBaseBasalRate() * 100) + "%)\n" +
+                    "(" + DecimalFormatter.to2Decimal(result.rate / ConfigBuilderPlugin.getPlugin().getActivePump().getBaseBasalRate() * 100) + "%)\n" +
                     MainApp.gs(R.string.duration) + ": " + DecimalFormatter.to0Decimal(result.duration) + " min\n";
         }
         ret += "\n" + MainApp.gs(R.string.reason) + ": " + result.reason;
@@ -715,7 +715,7 @@ public class ActionStringHandler {
         detailedBolusInfo.insulin = amount;
         detailedBolusInfo.isValid = false;
         detailedBolusInfo.source = Source.USER;
-        ConfigBuilderPlugin.getCommandQueue().bolus(detailedBolusInfo, new Callback() {
+        ConfigBuilderPlugin.getPlugin().getCommandQueue().bolus(detailedBolusInfo, new Callback() {
             @Override
             public void run() {
                 if (!result.success) {
@@ -732,8 +732,8 @@ public class ActionStringHandler {
         detailedBolusInfo.insulin = amount;
         detailedBolusInfo.carbs = carbs;
         detailedBolusInfo.source = Source.USER;
-        if (detailedBolusInfo.insulin > 0 || ConfigBuilderPlugin.getActivePump().getPumpDescription().storesCarbInfo) {
+        if (detailedBolusInfo.insulin > 0 || ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().storesCarbInfo) {
-            ConfigBuilderPlugin.getCommandQueue().bolus(detailedBolusInfo, new Callback() {
+            ConfigBuilderPlugin.getPlugin().getCommandQueue().bolus(detailedBolusInfo, new Callback() {
                 @Override
                 public void run() {
                     if (!result.success) {

app/src/main/java/info/nightscout/androidaps/plugins/Wear/wearintegration/WatchUpdaterService.java

@@ -209,7 +209,7 @@ public class WatchUpdaterService extends WearableListenerService implements
     }
 
     private void cancelBolus() {
-        ConfigBuilderPlugin.getActivePump().stopBolusDelivering();
+        ConfigBuilderPlugin.getPlugin().getActivePump().stopBolusDelivering();
     }
 
     private void sendData() {

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

@@ -96,7 +96,7 @@ public class CommandQueue {
     }
 
     private synchronized void removeAll(Command.CommandType type) {
-        for (int i = 0; i < queue.size(); i++) {
+        for (int i = queue.size() - 1; i >= 0; i--) {
             if (queue.get(i).commandType == type) {
                 queue.remove(i);
             }
@@ -245,7 +245,7 @@ public class CommandQueue {
         }
         removeAll(Command.CommandType.BOLUS);
         removeAll(Command.CommandType.SMB_BOLUS);
-        ConfigBuilderPlugin.getActivePump().stopBolusDelivering();
+        ConfigBuilderPlugin.getPlugin().getActivePump().stopBolusDelivering();
     }
 
     // returns true if command is queued
@@ -369,7 +369,7 @@ public class CommandQueue {
 
         // Compare with pump limits
         Profile.BasalValue[] basalValues = profile.getBasalValues();
-        PumpInterface pump = ConfigBuilderPlugin.getActivePump();
+        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
 
         for (Profile.BasalValue basalValue : basalValues) {
             if (basalValue.value < pump.getPumpDescription().basalMinimumRate) {
@@ -508,7 +508,7 @@ public class CommandQueue {
     }
 
     public boolean isThisProfileSet(Profile profile) {
-        PumpInterface activePump = ConfigBuilderPlugin.getActivePump();
+        PumpInterface activePump = ConfigBuilderPlugin.getPlugin().getActivePump();
         Profile current = ProfileFunctions.getInstance().getProfile();
         if (activePump != null && current != null) {
             boolean result = activePump.isThisProfileSet(profile);

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

@@ -54,7 +54,7 @@ public class QueueThread extends Thread {
 
         try {
             while (true) {
-                PumpInterface pump = ConfigBuilderPlugin.getActivePump();
+                PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
                 if (pump == null) {
                     if (L.isEnabled(L.PUMPQUEUE))
                         log.debug("pump == null");

app/src/main/java/info/nightscout/androidaps/queue/commands/CommandBolus.java

@@ -30,7 +30,7 @@ public class CommandBolus extends Command {
 
     @Override
     public void execute() {
-        PumpEnactResult r = ConfigBuilderPlugin.getActivePump().deliverTreatment(detailedBolusInfo);
+        PumpEnactResult r = ConfigBuilderPlugin.getPlugin().getActivePump().deliverTreatment(detailedBolusInfo);
 
         BolusProgressDialog.bolusEnded = true;
         MainApp.bus().post(new EventDismissBolusprogressIfRunning(r));

app/src/main/java/info/nightscout/androidaps/queue/commands/CommandCancelExtendedBolus.java

@@ -22,7 +22,7 @@ public class CommandCancelExtendedBolus extends Command {
 
     @Override
     public void execute() {
-        PumpEnactResult r = ConfigBuilderPlugin.getActivePump().cancelExtendedBolus();
+        PumpEnactResult r = ConfigBuilderPlugin.getPlugin().getActivePump().cancelExtendedBolus();
         if (L.isEnabled(L.PUMPQUEUE))
             log.debug("Result success: " + r.success + " enacted: " + r.enacted);
         if (callback != null)

app/src/main/java/info/nightscout/androidaps/queue/commands/CommandCancelTempBasal.java

@@ -25,7 +25,7 @@ public class CommandCancelTempBasal extends Command {
 
     @Override
     public void execute() {
-        PumpEnactResult r = ConfigBuilderPlugin.getActivePump().cancelTempBasal(enforceNew);
+        PumpEnactResult r = ConfigBuilderPlugin.getPlugin().getActivePump().cancelTempBasal(enforceNew);
         if (L.isEnabled(L.PUMPQUEUE))
             log.debug("Result success: " + r.success + " enacted: " + r.enacted);
         if (callback != null)

app/src/main/java/info/nightscout/androidaps/queue/commands/CommandExtendedBolus.java

@@ -27,7 +27,7 @@ public class CommandExtendedBolus extends Command {
 
     @Override
     public void execute() {
-        PumpEnactResult r = ConfigBuilderPlugin.getActivePump().setExtendedBolus(insulin, durationInMinutes);
+        PumpEnactResult r = ConfigBuilderPlugin.getPlugin().getActivePump().setExtendedBolus(insulin, durationInMinutes);
         if (L.isEnabled(L.PUMPQUEUE))
             log.debug("Result rate: " + insulin + " durationInMinutes: " + durationInMinutes + " success: " + r.success + " enacted: " + r.enacted);
         if (callback != null)

app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadEvents.java

@@ -24,7 +24,7 @@ public class CommandLoadEvents extends Command {
 
     @Override
     public void execute() {
-        PumpInterface pump = ConfigBuilderPlugin.getActivePump();
+        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
         if (pump instanceof DanaRInterface) {
             DanaRInterface danaPump = (DanaRInterface) pump;
             PumpEnactResult r = danaPump.loadEvents();

app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadHistory.java

@@ -27,7 +27,7 @@ public class CommandLoadHistory extends Command {
 
     @Override
     public void execute() {
-        PumpInterface pump = ConfigBuilderPlugin.getActivePump();
+        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
         if (pump instanceof DanaRInterface) {
             DanaRInterface danaPump = (DanaRInterface) pump;
             PumpEnactResult r = danaPump.loadHistory(type);

app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadTDDs.java

@@ -24,7 +24,7 @@ public class CommandLoadTDDs extends Command {
 
     @Override
     public void execute() {
-        PumpInterface pump = ConfigBuilderPlugin.getActivePump();
+        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
         PumpEnactResult r = pump.loadTDDs();
         if (L.isEnabled(L.PUMPQUEUE))
             log.debug("Result success: " + r.success + " enacted: " + r.enacted);

app/src/main/java/info/nightscout/androidaps/queue/commands/CommandReadStatus.java

@@ -28,11 +28,11 @@ public class CommandReadStatus extends Command {
 
     @Override
     public void execute() {
-        ConfigBuilderPlugin.getActivePump().getPumpStatus();
+        ConfigBuilderPlugin.getPlugin().getActivePump().getPumpStatus();
         LocalAlertUtils.notifyPumpStatusRead();
         if (L.isEnabled(L.PUMPQUEUE))
             log.debug("CommandReadStatus executed. Reason: " + reason);
-        final PumpInterface pump = ConfigBuilderPlugin.getActivePump();
+        final PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
         PumpEnactResult result = new PumpEnactResult().success(false);
         if (pump != null) {
             long lastConnection = pump.lastDataTime();

app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSMBBolus.java

@@ -37,7 +37,7 @@ public class CommandSMBBolus extends Command {
                 log.debug("SMB requsted but still in 3 min interval");
             r = new PumpEnactResult().enacted(false).success(false).comment("SMB requsted but still in 3 min interval");
         } else if (detailedBolusInfo.deliverAt != 0 && detailedBolusInfo.deliverAt + T.mins(1).msecs() > System.currentTimeMillis()) {
-            r = ConfigBuilderPlugin.getActivePump().deliverTreatment(detailedBolusInfo);
+            r = ConfigBuilderPlugin.getPlugin().getActivePump().deliverTreatment(detailedBolusInfo);
         } else {
             r = new PumpEnactResult().enacted(false).success(false).comment("SMB request too old");
             if (L.isEnabled(L.PUMPQUEUE))

app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSetProfile.java

@@ -33,7 +33,7 @@ public class CommandSetProfile extends Command {
 
     @Override
     public void execute() {
-        if (ConfigBuilderPlugin.getCommandQueue().isThisProfileSet(profile)) {
+        if (ConfigBuilderPlugin.getPlugin().getCommandQueue().isThisProfileSet(profile)) {
             if (L.isEnabled(L.PUMPQUEUE))
                 log.debug("Correct profile already set. profile: " + profile.toString());
             if (callback != null)
@@ -41,7 +41,7 @@ public class CommandSetProfile extends Command {
             return;
         }
 
-        PumpEnactResult r = ConfigBuilderPlugin.getActivePump().setNewBasalProfile(profile);
+        PumpEnactResult r = ConfigBuilderPlugin.getPlugin().getActivePump().setNewBasalProfile(profile);
         if (L.isEnabled(L.PUMPQUEUE))
             log.debug("Result success: " + r.success + " enacted: " + r.enacted + " profile: " + profile.toString());
         if (callback != null)

app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSetUserSettings.java

@@ -24,7 +24,7 @@ public class CommandSetUserSettings extends Command {
 
     @Override
     public void execute() {
-        PumpInterface pump = ConfigBuilderPlugin.getActivePump();
+        PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
         if (pump instanceof DanaRInterface) {
             DanaRInterface danaPump = (DanaRInterface) pump;
             PumpEnactResult r = danaPump.setUserOptions();

app/src/main/java/info/nightscout/androidaps/queue/commands/CommandTempBasalAbsolute.java

@@ -32,7 +32,7 @@ public class CommandTempBasalAbsolute extends Command {
 
     @Override
     public void execute() {
-        PumpEnactResult r = ConfigBuilderPlugin.getActivePump().setTempBasalAbsolute(absoluteRate, durationInMinutes, profile, enforceNew);
+        PumpEnactResult r = ConfigBuilderPlugin.getPlugin().getActivePump().setTempBasalAbsolute(absoluteRate, durationInMinutes, profile, enforceNew);
         if (L.isEnabled(L.PUMPQUEUE))
             log.debug("Result rate: " + absoluteRate + " durationInMinutes: " + durationInMinutes + " success: " + r.success + " enacted: " + r.enacted);
         if (callback != null)

app/src/main/java/info/nightscout/androidaps/queue/commands/CommandTempBasalPercent.java

@@ -32,7 +32,7 @@ public class CommandTempBasalPercent extends Command {
 
     @Override
     public void execute() {
-        PumpEnactResult r = ConfigBuilderPlugin.getActivePump().setTempBasalPercent(percent, durationInMinutes, profile, enforceNew);
+        PumpEnactResult r = ConfigBuilderPlugin.getPlugin().getActivePump().setTempBasalPercent(percent, durationInMinutes, profile, enforceNew);
         if (L.isEnabled(L.PUMPQUEUE))
             log.debug("Result percent: " + percent + " durationInMinutes: " + durationInMinutes + " success: " + r.success + " enacted: " + r.enacted);
         if (callback != null)

app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java

@@ -60,7 +60,7 @@ public class KeepAliveReceiver extends BroadcastReceiver {
     }
 
     private void checkPump() {
-        final PumpInterface pump = ConfigBuilderPlugin.getActivePump();
+        final PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
         final Profile profile = ProfileFunctions.getInstance().getProfile();
         if (pump != null && profile != null) {
             long lastConnection = pump.lastDataTime();
@@ -75,14 +75,14 @@ public class KeepAliveReceiver extends BroadcastReceiver {
                 LocalAlertUtils.checkPumpUnreachableAlarm(lastConnection, isStatusOutdated);
             }
 
-            if (!pump.isThisProfileSet(profile) && !ConfigBuilderPlugin.getCommandQueue().isRunning(Command.CommandType.BASALPROFILE)) {
+            if (!pump.isThisProfileSet(profile) && !ConfigBuilderPlugin.getPlugin().getCommandQueue().isRunning(Command.CommandType.BASALPROFILE)) {
                 MainApp.bus().post(new EventProfileSwitchChange());
             } else if (isStatusOutdated && !pump.isBusy()) {
                 lastReadStatus = System.currentTimeMillis();
-                ConfigBuilderPlugin.getCommandQueue().readStatus("KeepAlive. Status outdated.", null);
+                ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("KeepAlive. Status outdated.", null);
             } else if (isBasalOutdated && !pump.isBusy()) {
                 lastReadStatus = System.currentTimeMillis();
-                ConfigBuilderPlugin.getCommandQueue().readStatus("KeepAlive. Basal outdated.", null);
+                ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("KeepAlive. Basal outdated.", null);
             }
         }
         if (lastRun != 0 && System.currentTimeMillis() - lastRun > T.mins(10).msecs()) {

app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.java

@@ -230,15 +230,15 @@ public class SWDefinition {
                 .add(new SWButton()
                         .text(R.string.insulinsourcesetup)
                         .action(() -> {
-                            final PluginBase plugin = (PluginBase) MainApp.getConfigBuilder().getActiveInsulin();
+                            final PluginBase plugin = (PluginBase) ConfigBuilderPlugin.getPlugin().getActiveInsulin();
                             PasswordProtection.QueryPassword(activity, R.string.settings_password, "settings_password", () -> {
                                 Intent i = new Intent(activity, PreferencesActivity.class);
                                 i.putExtra("id", plugin.getPreferencesId());
                                 activity.startActivity(i);
                             }, null);
                         })
-                        .visibility(() -> MainApp.getConfigBuilder().getActiveInsulin()!= null  && ((PluginBase) MainApp.getConfigBuilder().getActiveInsulin()).getPreferencesId() > 0))
+                        .visibility(() -> ConfigBuilderPlugin.getPlugin().getActiveInsulin()!= null  && ((PluginBase) ConfigBuilderPlugin.getPlugin().getActiveInsulin()).getPreferencesId() > 0))
-                .validator(() -> MainApp.getConfigBuilder().getActiveInsulin() != null)
+                .validator(() -> ConfigBuilderPlugin.getPlugin().getActiveInsulin() != null)
         )
         .add(new SWScreen(R.string.configbuilder_bgsource)
                 .skippable(false)
@@ -249,15 +249,15 @@ public class SWDefinition {
                 .add(new SWButton()
                         .text(R.string.bgsourcesetup)
                         .action(() -> {
-                            final PluginBase plugin = (PluginBase) MainApp.getConfigBuilder().getActiveBgSource();
+                            final PluginBase plugin = (PluginBase) ConfigBuilderPlugin.getPlugin().getActiveBgSource();
                             PasswordProtection.QueryPassword(activity, R.string.settings_password, "settings_password", () -> {
                                 Intent i = new Intent(activity, PreferencesActivity.class);
                                 i.putExtra("id", plugin.getPreferencesId());
                                 activity.startActivity(i);
                             }, null);
                         })
-                        .visibility(() -> MainApp.getConfigBuilder().getActiveBgSource()!= null  && ((PluginBase) MainApp.getConfigBuilder().getActiveBgSource()).getPreferencesId() > 0))
+                        .visibility(() -> ConfigBuilderPlugin.getPlugin().getActiveBgSource()!= null  && ((PluginBase) ConfigBuilderPlugin.getPlugin().getActiveBgSource()).getPreferencesId() > 0))
-                .validator(() -> MainApp.getConfigBuilder().getActiveBgSource() != null)
+                .validator(() -> ConfigBuilderPlugin.getPlugin().getActiveBgSource() != null)
         )
         .add(new SWScreen(R.string.configbuilder_profile)
                         .skippable(false)
@@ -267,7 +267,7 @@ public class SWDefinition {
                         .add(new SWPlugin()
                                 .option(PluginType.PROFILE, R.string.configbuilder_profile_description)
                                 .label(R.string.configbuilder_profile))
-                        .validator(() -> MainApp.getConfigBuilder().getActiveProfileInterface() != null)
+                        .validator(() -> ConfigBuilderPlugin.getPlugin().getActiveProfileInterface() != null)
                 )
         .add(new SWScreen(R.string.nsprofile)
                         .skippable(false)
@@ -317,18 +317,18 @@ public class SWDefinition {
                 .add(new SWButton()
                         .text(R.string.pumpsetup)
                         .action(() -> {
-                            final PluginBase plugin = (PluginBase) MainApp.getConfigBuilder().getActivePump();
+                            final PluginBase plugin = (PluginBase) ConfigBuilderPlugin.getPlugin().getActivePump();
                             PasswordProtection.QueryPassword(activity, R.string.settings_password, "settings_password", () -> {
                                 Intent i = new Intent(activity, PreferencesActivity.class);
                                 i.putExtra("id", plugin.getPreferencesId());
                                 activity.startActivity(i);
                             }, null);
                         })
-                        .visibility(() -> ((PluginBase) MainApp.getConfigBuilder().getActivePump()).getPreferencesId() > 0))
+                        .visibility(() -> ((PluginBase) ConfigBuilderPlugin.getPlugin().getActivePump()).getPreferencesId() > 0))
                 .add(new SWButton()
                         .text(R.string.readstatus)
-                        .action(() -> ConfigBuilderPlugin.getCommandQueue().readStatus("Clicked connect to pump", null))
+                        .action(() -> ConfigBuilderPlugin.getPlugin().getCommandQueue().readStatus("Clicked connect to pump", null))
-                        .visibility(() -> MainApp.getConfigBuilder().getActivePump() != null))
+                        .visibility(() -> ConfigBuilderPlugin.getPlugin().getActivePump() != null))
                 .add(new SWEventListener(this)
                         .listener(new Object() {
                             @Subscribe
@@ -337,7 +337,7 @@ public class SWDefinition {
                             }
                         })
                 )
-                .validator(() -> MainApp.getConfigBuilder().getActivePump() != null && MainApp.getConfigBuilder().getActivePump().isInitialized())
+                .validator(() -> ConfigBuilderPlugin.getPlugin().getActivePump() != null && ConfigBuilderPlugin.getPlugin().getActivePump().isInitialized())
         )
         .add(new SWScreen(R.string.configbuilder_aps)
                 .skippable(false)
@@ -353,15 +353,15 @@ public class SWDefinition {
                 .add(new SWButton()
                         .text(R.string.apssetup)
                         .action(() -> {
-                            final PluginBase plugin = (PluginBase) MainApp.getConfigBuilder().getActiveAPS();
+                            final PluginBase plugin = (PluginBase) ConfigBuilderPlugin.getPlugin().getActiveAPS();
                             PasswordProtection.QueryPassword(activity, R.string.settings_password, "settings_password", () -> {
                                 Intent i = new Intent(activity, PreferencesActivity.class);
                                 i.putExtra("id", plugin.getPreferencesId());
                                 activity.startActivity(i);
                             }, null);
                         })
-                        .visibility(() -> MainApp.getConfigBuilder().getActiveAPS() != null && ((PluginBase) MainApp.getConfigBuilder().getActiveAPS()).getPreferencesId() > 0))
+                        .visibility(() -> ConfigBuilderPlugin.getPlugin().getActiveAPS() != null && ((PluginBase) ConfigBuilderPlugin.getPlugin().getActiveAPS()).getPreferencesId() > 0))
-                .validator(() -> MainApp.getConfigBuilder().getActiveAPS() != null)
+                .validator(() -> ConfigBuilderPlugin.getPlugin().getActiveAPS() != null)
                 .visibility(() -> Config.APS)
         )
         .add(new SWScreen(R.string.apsmode_title)
@@ -405,15 +405,15 @@ public class SWDefinition {
                 .add(new SWButton()
                         .text(R.string.sensitivitysetup)
                         .action(() -> {
-                            final PluginBase plugin = (PluginBase) MainApp.getConfigBuilder().getActiveSensitivity();
+                            final PluginBase plugin = (PluginBase) ConfigBuilderPlugin.getPlugin().getActiveSensitivity();
                             PasswordProtection.QueryPassword(activity, R.string.settings_password, "settings_password", () -> {
                                 Intent i = new Intent(activity, PreferencesActivity.class);
                                 i.putExtra("id", plugin.getPreferencesId());
                                 activity.startActivity(i);
                             }, null);
                         })
-                        .visibility(() -> MainApp.getConfigBuilder().getActiveSensitivity() != null && ((PluginBase) MainApp.getConfigBuilder().getActiveSensitivity()).getPreferencesId() > 0))
+                        .visibility(() -> ConfigBuilderPlugin.getPlugin().getActiveSensitivity() != null && ((PluginBase) ConfigBuilderPlugin.getPlugin().getActiveSensitivity()).getPreferencesId() > 0))
-                .validator(() -> MainApp.getConfigBuilder().getActiveSensitivity() != null)
+                .validator(() -> ConfigBuilderPlugin.getPlugin().getActiveSensitivity() != null)
         )
         .add(new SWScreen(R.string.objectives)
                 .skippable(false)
@@ -563,15 +563,15 @@ public class SWDefinition {
                 .add(new SWButton()
                         .text(R.string.bgsourcesetup)
                         .action(() -> {
-                            final PluginBase plugin = (PluginBase) MainApp.getConfigBuilder().getActiveBgSource();
+                            final PluginBase plugin = (PluginBase) ConfigBuilderPlugin.getPlugin().getActiveBgSource();
                             PasswordProtection.QueryPassword(activity, R.string.settings_password, "settings_password", () -> {
                                 Intent i = new Intent(activity, PreferencesActivity.class);
                                 i.putExtra("id", plugin.getPreferencesId());
                                 activity.startActivity(i);
                             }, null);
                         })
-                        .visibility(() -> MainApp.getConfigBuilder().getActiveBgSource()!= null  && ((PluginBase) MainApp.getConfigBuilder().getActiveBgSource()).getPreferencesId() > 0))
+                        .visibility(() -> ConfigBuilderPlugin.getPlugin().getActiveBgSource()!= null  && ((PluginBase) ConfigBuilderPlugin.getPlugin().getActiveBgSource()).getPreferencesId() > 0))
-                .validator(() -> MainApp.getConfigBuilder().getActiveBgSource() != null)
+                .validator(() -> ConfigBuilderPlugin.getPlugin().getActiveBgSource() != null)
         )
         .add(new SWScreen(R.string.patientage)
                 .skippable(false)
@@ -598,15 +598,15 @@ public class SWDefinition {
                 .add(new SWButton()
                         .text(R.string.insulinsourcesetup)
                         .action(() -> {
-                            final PluginBase plugin = (PluginBase) MainApp.getConfigBuilder().getActiveInsulin();
+                            final PluginBase plugin = (PluginBase) ConfigBuilderPlugin.getPlugin().getActiveInsulin();
                             PasswordProtection.QueryPassword(activity, R.string.settings_password, "settings_password", () -> {
                                 Intent i = new Intent(activity, PreferencesActivity.class);
                                 i.putExtra("id", plugin.getPreferencesId());
                                 activity.startActivity(i);
                             }, null);
                         })
-                        .visibility(() -> MainApp.getConfigBuilder().getActiveInsulin()!= null  && ((PluginBase) MainApp.getConfigBuilder().getActiveInsulin()).getPreferencesId() > 0))
+                        .visibility(() -> ConfigBuilderPlugin.getPlugin().getActiveInsulin()!= null  && ((PluginBase) ConfigBuilderPlugin.getPlugin().getActiveInsulin()).getPreferencesId() > 0))
-                .validator(() -> MainApp.getConfigBuilder().getActiveInsulin() != null)
+                .validator(() -> ConfigBuilderPlugin.getPlugin().getActiveInsulin() != null)
         )
         .add(new SWScreen(R.string.configbuilder_sensitivity)
                 .skippable(false)
@@ -622,15 +622,15 @@ public class SWDefinition {
                 .add(new SWButton()
                         .text(R.string.sensitivitysetup)
                         .action(() -> {
-                            final PluginBase plugin = (PluginBase) MainApp.getConfigBuilder().getActiveSensitivity();
+                            final PluginBase plugin = (PluginBase) ConfigBuilderPlugin.getPlugin().getActiveSensitivity();
                             PasswordProtection.QueryPassword(activity, R.string.settings_password, "settings_password", () -> {
                                 Intent i = new Intent(activity, PreferencesActivity.class);
                                 i.putExtra("id", plugin.getPreferencesId());
                                 activity.startActivity(i);
                             }, null);
                         })
-                        .visibility(() -> MainApp.getConfigBuilder().getActiveSensitivity() != null && ((PluginBase) MainApp.getConfigBuilder().getActiveSensitivity()).getPreferencesId() > 0))
+                        .visibility(() -> ConfigBuilderPlugin.getPlugin().getActiveSensitivity() != null && ((PluginBase) ConfigBuilderPlugin.getPlugin().getActiveSensitivity()).getPreferencesId() > 0))
-                .validator(() -> MainApp.getConfigBuilder().getActiveSensitivity() != null)
+                .validator(() -> ConfigBuilderPlugin.getPlugin().getActiveSensitivity() != null)
         )
         ;
     }

app/src/main/java/info/nightscout/utils/AndroidPermission.java

@@ -44,7 +44,7 @@ public class AndroidPermission {
     }
 
     public static synchronized void notifyForSMSPermissions(Activity activity) {
-        if (SP.getBoolean(R.string.smscommunicator_remotecommandsallowed, false)) {
+        if (SP.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)) {
             if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP_MR1) {
                 if (!checkForPermission(activity, Manifest.permission.RECEIVE_SMS)) {
                     NotificationWithAction notification = new NotificationWithAction(Notification.PERMISSION_SMS, MainApp.gs(R.string.smscommunicator_missingsmspermission), Notification.URGENT);

app/src/main/java/info/nightscout/utils/BolusWizard.java

@@ -136,7 +136,7 @@ public class BolusWizard {
             calculatedTotalInsulin = 0d;
         }
 
-        double bolusStep = ConfigBuilderPlugin.getActivePump().getPumpDescription().bolusStep;
+        double bolusStep = ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().bolusStep;
         calculatedTotalInsulin = Round.roundTo(calculatedTotalInsulin, bolusStep);
 
         log.debug(log());

app/src/main/java/info/nightscout/utils/DecimalFormatter.java

@@ -46,13 +46,13 @@ public class DecimalFormatter {
     }
 
     public static String toPumpSupportedBolus(double value) {
-        return ConfigBuilderPlugin.getActivePump().getPumpDescription().bolusStep <= 0.051
+        return ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().bolusStep <= 0.051
                 ? to2Decimal(value)
                 : to1Decimal(value);
     }
 
     public static DecimalFormat pumpSupportedBolusFormat() {
-        return ConfigBuilderPlugin.getActivePump().getPumpDescription().bolusStep <= 0.051
+        return ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().bolusStep <= 0.051
                 ? new DecimalFormat("0.00")
                 : new DecimalFormat("0.0");
     }

app/src/main/java/info/nightscout/utils/FabricPrivacy.java

@@ -110,12 +110,13 @@ public class FabricPrivacy {
         CustomEvent pluginStats = new CustomEvent("PluginStats");
         pluginStats.putCustomAttribute("version", BuildConfig.VERSION);
         pluginStats.putCustomAttribute("HEAD", BuildConfig.HEAD);
+        pluginStats.putCustomAttribute("language", SP.getString(R.string.key_language,"default"));
         for (PluginBase plugin : MainApp.getPluginsList()) {
-            if (!plugin.pluginDescription.alwaysEnabled) {
+            if (plugin.isEnabled(plugin.getType()) && !plugin.pluginDescription.alwaysEnabled) {
-                if (plugin.isEnabled(plugin.getType()))
+                // Fabric allows no more than 20 attributes attached to an event. By reporting disabled plugins as
+                // well, we would exceed that threshold, so only report what is enabled
+                // TODO >2.0: consider reworking this to upload an event per enabled plugin instead.
                 pluginStats.putCustomAttribute(plugin.getClass().getSimpleName(), "enabled");
-                else
-                    pluginStats.putCustomAttribute(plugin.getClass().getSimpleName(), "disabled");
             }
         }
 

app/src/main/java/info/nightscout/utils/LocalAlertUtils.java

@@ -78,7 +78,7 @@ public class LocalAlertUtils {
     public static void notifyPumpStatusRead() {
         //TODO: persist the actual time the pump is read and simplify the whole logic when to alarm
 
-        final PumpInterface pump = ConfigBuilderPlugin.getActivePump();
+        final PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
         final Profile profile = ProfileFunctions.getInstance().getProfile();
         if (pump != null && profile != null) {
             long lastConnection = pump.lastDataTime();