Merge pull request #16 from MilosKozak/dev

Dev 9/01/18

Steampunk_graphics_source_link.md

@@ -0,0 +1,7 @@
+Follow this link to get the source PSD file for the Steampunk graphics. The file could not be included in the repository as it exceeds Github's 25 mb limit.
+
+Note, the source image size is 1600x1600. The image size should be reduced to 400x400 prior to export of final PNG.
+
+https://drive.google.com/drive/folders/1MrdgnQz3wOniDvRSMhAsqHBYb2WmE5i0
+
+Graphics created by (Github): andrew-warrington

app/build.gradle

@@ -174,6 +174,10 @@ dependencies {
     compile 'junit:junit:4.12'
     testCompile 'org.json:json:20140107'
     testCompile 'org.mockito:mockito-core:2.7.22'
+    testCompile 'org.powermock:powermock-api-mockito2:1.7.3'
+    testCompile 'org.powermock:powermock-module-junit4-rule-agent:1.7.3'
+    testCompile 'org.powermock:powermock-module-junit4-rule:1.7.3'
+    testCompile 'org.powermock:powermock-module-junit4:1.7.3'
     androidTestCompile 'org.mockito:mockito-core:2.7.22'
     androidTestCompile 'com.google.dexmaker:dexmaker:1.2'
     androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2'
@@ -188,4 +192,6 @@ dependencies {
     compile 'com.google.code.gson:gson:2.7'
     compile 'com.google.guava:guava:20.0'
 
+    compile 'net.danlew:android.joda:2.9.9.1'
+    testCompile 'joda-time:joda-time:2.9.4.2'
 }

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

@@ -112,12 +112,16 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         runOnUiThread(new Runnable() {
             @Override
             public void run() {
+                if(ev.recreate) {
                     recreate();
+                }else {
                     try { // activity may be destroyed
                         setUpTabs(true);
                     } catch (IllegalStateException e) {
                         log.error("Unhandled exception", e);
                     }
+                }
+
                 boolean lockScreen = BuildConfig.NSCLIENTOLNY && SP.getBoolean("lockscreen", false);
                 if (lockScreen)
                     getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);

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

@@ -15,6 +15,8 @@ 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;
 
@@ -96,6 +98,7 @@ public class MainApp extends Application {
         super.onCreate();
         Fabric.with(this, new Crashlytics());
         Fabric.with(this, new Answers());
+        JodaTimeAndroid.init(this);
         Crashlytics.setString("BUILDVERSION", BuildConfig.BUILDVERSION);
         log.info("Version: " + BuildConfig.VERSION_NAME);
         log.info("BuildVersion: " + BuildConfig.BUILDVERSION);
@@ -213,7 +216,7 @@ public class MainApp extends Application {
 
     public void stopKeepAliveService() {
         if (keepAliveReceiver != null)
-            keepAliveReceiver.cancelAlarm(this);
+            KeepAliveReceiver.cancelAlarm(this);
     }
 
     public static Bus bus() {

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

@@ -1,5 +1,6 @@
 package info.nightscout.androidaps;
 
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.EditTextPreference;
@@ -58,8 +59,9 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
         if (key.equals("language")) {
             String lang = sharedPreferences.getString("language", "en");
             LocaleHelper.setLocale(getApplicationContext(), lang);
-            recreate();
-            MainApp.bus().post(new EventRefreshGui());
+            MainApp.bus().post(new EventRefreshGui(true));
+            //recreate() does not update language so better close settings
+            finish();
         }
         if (key.equals("short_tabtitles")) {
             MainApp.bus().post(new EventRefreshGui());
@@ -149,10 +151,6 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
                 addPreferencesFromResourceIfEnabled(SensitivityWeightedAveragePlugin.getPlugin(), PluginBase.SENSITIVITY);
                 addPreferencesFromResourceIfEnabled(SensitivityOref0Plugin.getPlugin(), PluginBase.SENSITIVITY);
 
-                if (!Config.NSCLIENT && !Config.G5UPLOADER) {
-                    addPreferencesFromResource(R.xml.pref_profile);
-                }
-
                 if (Config.DANAR) {
                     addPreferencesFromResourceIfEnabled(DanaRPlugin.getPlugin(), PluginBase.PUMP);
                     addPreferencesFromResourceIfEnabled(DanaRKoreanPlugin.getPlugin(), PluginBase.PUMP);

app/src/main/java/info/nightscout/androidaps/Services/DataService.java

@@ -96,7 +96,12 @@ public class DataService extends IntentService {
 
         boolean isNSProfile = ConfigBuilderPlugin.getActiveProfileInterface().getClass().equals(NSProfilePlugin.class);
 
-        boolean nsUploadOnly = SP.getBoolean(R.string.key_ns_upload_only, false);
+        boolean acceptNSData = !SP.getBoolean(R.string.key_ns_upload_only, false);
+        Bundle bundles = intent.getExtras();
+        if (bundles != null && bundles.containsKey("islocal")) {
+            acceptNSData = acceptNSData || bundles.getBoolean("islocal");
+        }
+
 
         if (intent != null) {
             final String action = intent.getAction();
@@ -117,17 +122,15 @@ public class DataService extends IntentService {
                     handleNewDataFromDexcomG5(intent);
                 }
             } else if (Intents.ACTION_NEW_SGV.equals(action)) {
-                // always handle SGV if NS-Client is the source
-                if (nsClientEnabled) {
+                // always backfill SGV from NS
                 handleNewDataFromNSClient(intent);
-                }
                 // Objectives 0
                 ObjectivesPlugin.bgIsAvailableInNS = true;
                 ObjectivesPlugin.saveProgress();
             } else if (isNSProfile && Intents.ACTION_NEW_PROFILE.equals(action) || Intents.ACTION_NEW_DEVICESTATUS.equals(action)) {
                 // always handle Profile if NSProfile is enabled without looking at nsUploadOnly
                 handleNewDataFromNSClient(intent);
-            } else if (!nsUploadOnly &&
+            } else if (acceptNSData &&
                     (Intents.ACTION_NEW_TREATMENT.equals(action) ||
                             Intents.ACTION_CHANGED_TREATMENT.equals(action) ||
                             Intents.ACTION_REMOVED_TREATMENT.equals(action) ||
@@ -301,7 +304,7 @@ public class DataService extends IntentService {
                     log.error("Unhandled exception", e);
                 }
                 if (ConfigBuilderPlugin.nightscoutVersionCode < Config.SUPPORTEDNSVERSION) {
-                    Notification notification = new Notification(Notification.OLD_NS, MainApp.sResources.getString(R.string.unsupportednsversion), Notification.URGENT);
+                    Notification notification = new Notification(Notification.OLD_NS, MainApp.sResources.getString(R.string.unsupportednsversion), Notification.NORMAL);
                     MainApp.bus().post(new EventNewNotification(notification));
                 } else {
                     MainApp.bus().post(new EventDismissNotification(Notification.OLD_NS));

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

@@ -64,14 +64,21 @@ public class GlucoseStatus {
         return this;
     }
 
+
+
     @Nullable
     public static GlucoseStatus getGlucoseStatusData(){
+        return getGlucoseStatusData(false);
+    }
+
+    @Nullable
+    public static GlucoseStatus getGlucoseStatusData(boolean allowOldData) {
         // load 45min
         long fromtime = (long) (System.currentTimeMillis() - 60 * 1000L * 45);
         List<BgReading> data = MainApp.getDbHelper().getBgreadingsDataFromTime(fromtime, false);
 
         int sizeRecords = data.size();
-        if (sizeRecords < 1 || data.get(0).date < System.currentTimeMillis() - 7 * 60 * 1000L) {
+        if (sizeRecords < 1 || (data.get(0).date < System.currentTimeMillis() - 7 * 60 * 1000L && !allowOldData)) {
             return null;
         }
 

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

@@ -17,9 +17,13 @@ import java.util.TimeZone;
 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.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
+import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.DecimalFormatter;
 import info.nightscout.utils.ToastUtils;
 
@@ -160,15 +164,23 @@ public class Profile {
         for (Integer index = 0; index < array.length(); index++) {
             try {
                 final JSONObject o = array.getJSONObject(index);
-                long tas = getShitfTimeSecs((int) o.getLong("timeAsSeconds"));
-                Double value = o.getDouble("value") * multiplier;
+                long tas = 0;
+                try {
+                    tas = getShitfTimeSecs((int) o.getLong("timeAsSeconds"));
+                } catch (JSONException e) {
+                    String time = o.getString("time");
+                    tas = getShitfTimeSecs(DateUtil.toSeconds(time));
+                    //log.debug(">>>>>>>>>>>> Used recalculated timeAsSecons: " + time + " " + tas);
+                }
+                double value = o.getDouble("value") * multiplier;
                 sparse.put(tas, value);
+                if (value == 0) {
+                    Notification notification = new Notification(Notification.ZERO_VALUE_IN_PROFILE, MainApp.sResources.getString(R.string.zerovalueinprofile), Notification.URGENT);
+                    MainApp.bus().post(new EventNewNotification(notification));
+                }
             } catch (JSONException e) {
                 log.error("Unhandled exception", e);
-                try {
-                    log.error(array.getJSONObject(index).toString());
-                } catch (JSONException e1) {
-                }
+                log.error(json.toString());
             }
         }
 
@@ -327,8 +339,35 @@ public class Profile {
     }
 
     public Double getBasal(Integer timeAsSeconds) {
-        if (basal_v == null)
+        if (basal_v == null) {
             basal_v = convertToSparseArray(basal);
+            for (int index = 0; index < basal_v.size(); index++) {
+                long secondsFromMidnight = basal_v.keyAt(index);
+                if (secondsFromMidnight % 3600 != 0) {
+                    Notification notification = new Notification(Notification.BASAL_PROFILE_NOT_ALIGNED_TO_HOURS, MainApp.sResources.getString(R.string.basalprofilenotaligned), Notification.URGENT);
+                    MainApp.bus().post(new EventNewNotification(notification));
+                }
+            }
+
+            // Check for minimal basal value
+            PumpInterface pump = ConfigBuilderPlugin.getActivePump();
+            if (pump != null) {
+                PumpDescription description = pump.getPumpDescription();
+                for (int i = 0; i < basal_v.size(); i++) {
+                    if (basal_v.valueAt(i) < description.basalMinimumRate) {
+                        basal_v.setValueAt(i, description.basalMinimumRate);
+                        MainApp.bus().post(new EventNewNotification(new Notification(Notification.MINIMAL_BASAL_VALUE_REPLACED, MainApp.sResources.getString(R.string.minimalbasalvaluereplaced), Notification.NORMAL)));
+                    }
+                }
+                return getValueToTime(basal_v, timeAsSeconds);
+            } else {
+                // if pump not available (at start)
+                // do not store converted array
+                Double value = getValueToTime(basal_v, timeAsSeconds);
+                basal_v = null;
+                return value;
+            }
+        }
         return getValueToTime(basal_v, timeAsSeconds);
     }
 

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

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.Overview;
+package info.nightscout.androidaps.data;
 
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
@@ -9,11 +9,7 @@ import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Date;
-
 import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.utils.DateUtil;
 
 /**
  * Created by mike on 12.10.2016.
@@ -22,84 +18,7 @@ import info.nightscout.utils.DateUtil;
 public class QuickWizard {
     private static Logger log = LoggerFactory.getLogger(QuickWizard.class);
 
-    public class QuickWizardEntry {
-        public JSONObject storage;
-        public int position;
-
-        /*
-            {
-                buttonText: "Meal",
-                carbs: 36,
-                validFrom: 8 * 60 * 60, // seconds from midnight
-                validTo: 9 * 60 * 60,   // seconds from midnight
-            }
-         */
-        public QuickWizardEntry() {
-            String emptyData = "{\"buttonText\":\"\",\"carbs\":0,\"validFrom\":0,\"validTo\":86340}";
-            try {
-                storage = new JSONObject(emptyData);
-            } catch (JSONException e) {
-                log.error("Unhandled exception", e);
-            }
-            position = -1;
-        }
-
-        public QuickWizardEntry(JSONObject entry, int position) {
-            storage = entry;
-            this.position = position;
-        }
-
-        public Boolean isActive() {
-            return Profile.secondsFromMidnight() >= validFrom() && Profile.secondsFromMidnight() <= validTo();
-        }
-
-        public String buttonText() {
-            try {
-                return storage.getString("buttonText");
-            } catch (JSONException e) {
-                log.error("Unhandled exception", e);
-            }
-            return "";
-        }
-
-        public Integer carbs() {
-            try {
-                return storage.getInt("carbs");
-            } catch (JSONException e) {
-                log.error("Unhandled exception", e);
-            }
-            return 0;
-        }
-
-        public Date validFromDate() {
-            return DateUtil.toDate(validFrom());
-        }
-
-        public Date validToDate() {
-            return DateUtil.toDate(validTo());
-        }
-
-        public Integer validFrom() {
-            try {
-                return storage.getInt("validFrom");
-            } catch (JSONException e) {
-                log.error("Unhandled exception", e);
-            }
-            return 0;
-        }
-
-        public Integer validTo() {
-            try {
-                return storage.getInt("validTo");
-            } catch (JSONException e) {
-                log.error("Unhandled exception", e);
-            }
-            return 0;
-        }
-
-    }
-
-    JSONArray storage = new JSONArray();
+    private JSONArray storage = new JSONArray();
 
     public void setData(JSONArray newData) {
         storage = newData;

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

@@ -0,0 +1,242 @@
+package info.nightscout.androidaps.data;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Date;
+
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.db.BgReading;
+import info.nightscout.androidaps.db.TempTarget;
+import info.nightscout.androidaps.interfaces.TreatmentsInterface;
+import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
+import info.nightscout.androidaps.plugins.IobCobCalculator.AutosensData;
+import info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin;
+import info.nightscout.androidaps.plugins.Loop.LoopPlugin;
+import info.nightscout.utils.BolusWizard;
+import info.nightscout.utils.DateUtil;
+import info.nightscout.utils.SP;
+
+/**
+ * Created by mike on 25.12.2017.
+ */
+
+public class QuickWizardEntry {
+    private static Logger log = LoggerFactory.getLogger(QuickWizardEntry.class);
+
+    public JSONObject storage;
+    public int position;
+
+    public static final int YES = 0;
+    public static final int NO = 1;
+    public static final int POSITIVE_ONLY = 2;
+    public static final int NEGATIVE_ONLY = 3;
+
+    /*
+        {
+            buttonText: "Meal",
+            carbs: 36,
+            validFrom: 8 * 60 * 60, // seconds from midnight
+            validTo: 9 * 60 * 60,   // seconds from midnight
+            useBG: 0,
+            useCOB: 0,
+            useBolusIOB: 0,
+            useBasalIOB: 0,
+            useTrend: 0,
+            useSuperBolus: 0,
+            useTemptarget: 0
+        }
+     */
+    public QuickWizardEntry() {
+        String emptyData = "{\"buttonText\":\"\",\"carbs\":0,\"validFrom\":0,\"validTo\":86340}";
+        try {
+            storage = new JSONObject(emptyData);
+        } catch (JSONException e) {
+            log.error("Unhandled exception", e);
+        }
+        position = -1;
+    }
+
+    public QuickWizardEntry(JSONObject entry, int position) {
+        storage = entry;
+        this.position = position;
+    }
+
+    public Boolean isActive() {
+        return Profile.secondsFromMidnight() >= validFrom() && Profile.secondsFromMidnight() <= validTo();
+    }
+
+    public BolusWizard doCalc(Profile profile, TempTarget tempTarget, BgReading lastBG) {
+        BolusWizard wizard = new BolusWizard();
+
+        //BG
+        double bg = 0;
+        if (lastBG != null && useBG() == YES) {
+            bg = lastBG.valueToUnits(profile.getUnits());
+        }
+
+        // COB
+        double cob = 0d;
+        AutosensData autosensData = IobCobCalculatorPlugin.getLastAutosensData();
+        if (autosensData != null && useCOB() == YES) {
+            cob = autosensData.cob;
+        }
+
+        // Temp target
+        if (useTempTarget() == NO) {
+            tempTarget = null;
+        }
+
+        // Bolus IOB
+        boolean bolusIOB = false;
+        if (useBolusIOB() == YES) {
+            bolusIOB = true;
+        }
+
+        // Basal IOB
+        TreatmentsInterface treatments = MainApp.getConfigBuilder();
+        treatments.updateTotalIOBTempBasals();
+        IobTotal basalIob = treatments.getLastCalculationTempBasals().round();
+        boolean basalIOB = false;
+        if (useBasalIOB() == YES) {
+            basalIOB = true;
+        } else if (useBasalIOB() == POSITIVE_ONLY && basalIob.iob > 0) {
+            basalIOB = true;
+        } else if (useBasalIOB() == NEGATIVE_ONLY && basalIob.iob < 0) {
+            basalIOB = true;
+        }
+
+        // SuperBolus
+        boolean superBolus = false;
+        if (useSuperBolus() == YES && SP.getBoolean(R.string.key_usesuperbolus, false)) {
+            superBolus = true;
+        }
+        final LoopPlugin activeloop = ConfigBuilderPlugin.getActiveLoop();
+        if (activeloop != null && activeloop.isEnabled(activeloop.getType()) && activeloop.isSuperBolus())
+            superBolus = false;
+
+        // Trend
+        GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
+        boolean trend = false;
+        if (useTrend() == YES) {
+            trend = true;
+        } else if (useTrend() == POSITIVE_ONLY && glucoseStatus != null && glucoseStatus.short_avgdelta > 0) {
+            trend = true;
+        } else if (useTrend() == NEGATIVE_ONLY && glucoseStatus != null && glucoseStatus.short_avgdelta < 0) {
+            trend = true;
+        }
+
+        wizard.doCalc(profile, tempTarget, carbs(), cob, bg, 0d, bolusIOB, basalIOB, superBolus, trend);
+        return wizard;
+    }
+
+    public String buttonText() {
+        try {
+            return storage.getString("buttonText");
+        } catch (JSONException e) {
+            log.error("Unhandled exception", e);
+        }
+        return "";
+    }
+
+    public Integer carbs() {
+        try {
+            return storage.getInt("carbs");
+        } catch (JSONException e) {
+            log.error("Unhandled exception", e);
+        }
+        return 0;
+    }
+
+    public Date validFromDate() {
+        return DateUtil.toDate(validFrom());
+    }
+
+    public Date validToDate() {
+        return DateUtil.toDate(validTo());
+    }
+
+    public Integer validFrom() {
+        try {
+            return storage.getInt("validFrom");
+        } catch (JSONException e) {
+            log.error("Unhandled exception", e);
+        }
+        return 0;
+    }
+
+    public Integer validTo() {
+        try {
+            return storage.getInt("validTo");
+        } catch (JSONException e) {
+            log.error("Unhandled exception", e);
+        }
+        return 0;
+    }
+
+    public int useBG() {
+        try {
+            return storage.getInt("useBG");
+        } catch (JSONException e) {
+            //log.error("Unhandled exception", e);
+        }
+        return YES;
+    }
+
+    public int useCOB() {
+        try {
+            return storage.getInt("useCOB");
+        } catch (JSONException e) {
+            //log.error("Unhandled exception", e);
+        }
+        return NO;
+    }
+
+    public int useBolusIOB() {
+        try {
+            return storage.getInt("useBolusIOB");
+        } catch (JSONException e) {
+            //log.error("Unhandled exception", e);
+        }
+        return YES;
+    }
+
+    public int useBasalIOB() {
+        try {
+            return storage.getInt("useBasalIOB");
+        } catch (JSONException e) {
+            //log.error("Unhandled exception", e);
+        }
+        return YES;
+    }
+
+    public int useTrend() {
+        try {
+            return storage.getInt("useTrend");
+        } catch (JSONException e) {
+            //log.error("Unhandled exception", e);
+        }
+        return NO;
+    }
+
+    public int useSuperBolus() {
+        try {
+            return storage.getInt("useSuperBolus");
+        } catch (JSONException e) {
+            //log.error("Unhandled exception", e);
+        }
+        return NO;
+    }
+
+    public int useTempTarget() {
+        try {
+            return storage.getInt("useTempTarget");
+        } catch (JSONException e) {
+            //log.error("Unhandled exception", e);
+        }
+        return NO;
+    }
+}

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

@@ -53,6 +53,7 @@ public class BgReading implements DataPointWithLabelInterface {
         value = sgv.getMgdl();
         raw = sgv.getFiltered() != null ? sgv.getFiltered() : value;
         direction = sgv.getDirection();
+        _id = sgv.getId();
     }
 
     public Double valueToUnits(String units) {

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

@@ -30,7 +30,9 @@ import java.util.concurrent.TimeUnit;
 import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Profile;
+import info.nightscout.androidaps.data.ProfileStore;
 import info.nightscout.androidaps.events.EventCareportalEventChange;
 import info.nightscout.androidaps.events.EventExtendedBolusChange;
 import info.nightscout.androidaps.events.EventFoodDatabaseChanged;
@@ -43,9 +45,13 @@ import info.nightscout.androidaps.events.EventReloadTreatmentData;
 import info.nightscout.androidaps.events.EventTempBasalChange;
 import info.nightscout.androidaps.events.EventTempTargetChange;
 import info.nightscout.androidaps.events.EventTreatmentChange;
+import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.IobCobCalculator.events.EventNewHistoryData;
+import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.PumpDanaR.activities.DanaRNSHistorySync;
 import info.nightscout.androidaps.plugins.PumpVirtual.VirtualPumpPlugin;
+import info.nightscout.utils.PercentageSplitter;
 
 public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
     private static Logger log = LoggerFactory.getLogger(DatabaseHelper.class);
@@ -367,6 +373,15 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         return false;
     }
 
+    public void update(BgReading bgReading) {
+        bgReading.date = roundDateToSec(bgReading.date);
+        try {
+            getDaoBgReadings().update(bgReading);
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
     private static void scheduleBgChange() {
         class PostRunnable implements Runnable {
             public void run() {
@@ -397,7 +412,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             QueryBuilder<BgReading, Long> queryBuilder = daoBgReadings.queryBuilder();
             queryBuilder.orderBy("date", false);
             queryBuilder.limit(1L);
-            queryBuilder.where().gt("value", 38);
+            queryBuilder.where().gt("value", 38).and().eq("isValid", true);
             PreparedQuery<BgReading> preparedQuery = queryBuilder.prepare();
             bgList = daoBgReadings.query(preparedQuery);
 
@@ -435,7 +450,24 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             QueryBuilder<BgReading, Long> queryBuilder = daoBgreadings.queryBuilder();
             queryBuilder.orderBy("date", ascending);
             Where where = queryBuilder.where();
-            where.ge("date", mills).and().gt("value", 38);
+            where.ge("date", mills).and().gt("value", 38).and().eq("isValid", true);
+            PreparedQuery<BgReading> preparedQuery = queryBuilder.prepare();
+            bgReadings = daoBgreadings.query(preparedQuery);
+            return bgReadings;
+        } catch (SQLException e) {
+            log.error("Unhandled exception", e);
+        }
+        return new ArrayList<BgReading>();
+    }
+
+    public List<BgReading> getAllBgreadingsDataFromTime(long mills, boolean ascending) {
+        try {
+            Dao<BgReading, Long> daoBgreadings = getDaoBgReadings();
+            List<BgReading> bgReadings;
+            QueryBuilder<BgReading, Long> queryBuilder = daoBgreadings.queryBuilder();
+            queryBuilder.orderBy("date", ascending);
+            Where where = queryBuilder.where();
+            where.ge("date", mills);
             PreparedQuery<BgReading> preparedQuery = queryBuilder.prepare();
             bgReadings = daoBgreadings.query(preparedQuery);
             return bgReadings;
@@ -1572,6 +1604,8 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                         }
                     }
                 }
+                // look for already added percentage from NS
+                profileSwitch.profileName = PercentageSplitter.pureName(profileSwitch.profileName);
                 getDaoProfileSwitch().create(profileSwitch);
                 log.debug("PROFILESWITCH: New record from: " + Source.getString(profileSwitch.source) + " " + profileSwitch.toString());
                 scheduleProfileSwitchChange();
@@ -1645,6 +1679,19 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 profileSwitch.percentage = trJson.getInt("percentage");
             if (trJson.has("profileJson"))
                 profileSwitch.profileJson = trJson.getString("profileJson");
+            else {
+                ProfileStore store = ConfigBuilderPlugin.getActiveProfileInterface().getProfile();
+                Profile profile = store.getSpecificProfile(profileSwitch.profileName);
+                if (profile != null) {
+                    profileSwitch.profileJson = profile.getData().toString();
+                    log.debug("Profile switch prefilled with JSON from local store");
+                } else {
+                    Notification notification = new Notification(Notification.NO_LOCALE_PROFILE_FOUND, MainApp.sResources.getString(R.string.nolocaleprofilefound), Notification.URGENT);
+                    MainApp.bus().post(new EventNewNotification(notification));
+                    log.debug("JSON for profile switch doesn't exist. Ignoring ...");
+                    return;
+                }
+            }
             if (trJson.has("profilePlugin"))
                 profileSwitch.profilePlugin = trJson.getString("profilePlugin");
             createOrUpdate(profileSwitch);

app/src/main/java/info/nightscout/androidaps/events/EventRefreshGui.java

@@ -4,4 +4,11 @@ package info.nightscout.androidaps.events;
  * Created by mike on 13.06.2016.
  */
 public class EventRefreshGui extends Event {
+    public boolean recreate = false;
+    public EventRefreshGui(boolean recreate) {
+        this.recreate = recreate;
+    }
+    public EventRefreshGui(){
+        this(false);
+    }
 }

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

@@ -15,6 +15,8 @@ public interface ConstraintsInterface {
 
     boolean isAMAModeEnabled();
 
+    boolean isSMBModeEnabled();
+
     Double applyBasalConstraints(Double absoluteRate);
 
     Integer applyBasalConstraints(Integer percentRate);

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

@@ -21,5 +21,5 @@ public interface InsulinInterface {
     String getFriendlyName();
     String getComment();
     double getDia();
-    public Iob iobCalcForTreatment(Treatment treatment, long time, Double dia);
+    public Iob iobCalcForTreatment(Treatment treatment, long time, double dia);
 }

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

@@ -36,7 +36,7 @@ public interface PumpInterface {
     PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo);
     void stopBolusDelivering();
     PumpEnactResult setTempBasalAbsolute(Double absoluteRate, Integer durationInMinutes, boolean enforceNew);
-    PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes);
+    PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes, boolean enforceNew);
     PumpEnactResult setExtendedBolus(Double insulin, Integer durationInMinutes);
     //some pumps might set a very short temp close to 100% as cancelling a temp can be noisy
     //when the cancel request is requested by the user (forced), the pump should always do a real cancel

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

@@ -8,7 +8,6 @@ import android.support.v4.app.FragmentManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 
 import com.crashlytics.android.Crashlytics;
 import com.crashlytics.android.answers.Answers;
@@ -33,6 +32,7 @@ import info.nightscout.androidaps.plugins.Careportal.Dialogs.NewNSTreatmentDialo
 import info.nightscout.androidaps.plugins.Careportal.OptionsToShow;
 import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
+import info.nightscout.utils.SingleClickButton;
 
 /**
  * A simple {@link Fragment} subclass.
@@ -45,13 +45,13 @@ public class ActionsFragment extends SubscriberFragment implements View.OnClickL
         return actionsPlugin;
     }
 
-    Button profileSwitch;
-    Button tempTarget;
-    Button extendedBolus;
-    Button extendedBolusCancel;
-    Button tempBasal;
-    Button tempBasalCancel;
-    Button fill;
+    SingleClickButton profileSwitch;
+    SingleClickButton tempTarget;
+    SingleClickButton extendedBolus;
+    SingleClickButton extendedBolusCancel;
+    SingleClickButton tempBasal;
+    SingleClickButton tempBasalCancel;
+    SingleClickButton fill;
 
     public ActionsFragment() {
         super();
@@ -64,13 +64,13 @@ public class ActionsFragment extends SubscriberFragment implements View.OnClickL
         try {
             View view = inflater.inflate(R.layout.actions_fragment, container, false);
 
-            profileSwitch = (Button) view.findViewById(R.id.actions_profileswitch);
-            tempTarget = (Button) view.findViewById(R.id.actions_temptarget);
-            extendedBolus = (Button) view.findViewById(R.id.actions_extendedbolus);
-            extendedBolusCancel = (Button) view.findViewById(R.id.actions_extendedbolus_cancel);
-            tempBasal = (Button) view.findViewById(R.id.actions_settempbasal);
-            tempBasalCancel = (Button) view.findViewById(R.id.actions_canceltempbasal);
-            fill = (Button) view.findViewById(R.id.actions_fill);
+            profileSwitch = (SingleClickButton) view.findViewById(R.id.actions_profileswitch);
+            tempTarget = (SingleClickButton) view.findViewById(R.id.actions_temptarget);
+            extendedBolus = (SingleClickButton) view.findViewById(R.id.actions_extendedbolus);
+            extendedBolusCancel = (SingleClickButton) view.findViewById(R.id.actions_extendedbolus_cancel);
+            tempBasal = (SingleClickButton) view.findViewById(R.id.actions_settempbasal);
+            tempBasalCancel = (SingleClickButton) view.findViewById(R.id.actions_canceltempbasal);
+            fill = (SingleClickButton) view.findViewById(R.id.actions_fill);
 
             profileSwitch.setOnClickListener(this);
             tempTarget.setOnClickListener(this);
@@ -127,8 +127,7 @@ public class ActionsFragment extends SubscriberFragment implements View.OnClickL
                         return;
                     }
                     final PumpInterface pump = ConfigBuilderPlugin.getActivePump();
-                    boolean allowProfileSwitch = MainApp.getConfigBuilder().getActiveProfileInterface().getProfile().getProfileList().size() > 1;
-                    if (!pump.getPumpDescription().isSetBasalProfileCapable || !pump.isInitialized() || pump.isSuspended() || !allowProfileSwitch)
+                    if (!pump.getPumpDescription().isSetBasalProfileCapable || !pump.isInitialized() || pump.isSuspended())
                         profileSwitch.setVisibility(View.GONE);
                     else
                         profileSwitch.setVisibility(View.VISIBLE);

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

@@ -100,6 +100,9 @@ public class FillDialog extends DialogFragment implements OnClickListener {
         if (button1.getVisibility() == View.GONE && button2.getVisibility() == View.GONE && button3.getVisibility() == View.GONE) {
             divider.setVisibility(View.GONE);
         }
+
+        setCancelable(true);
+        getDialog().setCanceledOnTouchOutside(false);
         return view;
     }
 

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

@@ -54,14 +54,10 @@ public class NewExtendedBolusDialog extends DialogFragment implements View.OnCli
 
         view.findViewById(R.id.ok).setOnClickListener(this);
         view.findViewById(R.id.cancel).setOnClickListener(this);
-        return view;
-    }
 
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (getDialog() != null)
-            getDialog().getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        setCancelable(true);
+        getDialog().setCanceledOnTouchOutside(false);
+        return view;
     }
 
     @Override

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

@@ -102,6 +102,9 @@ public class NewTempBasalDialog extends DialogFragment implements View.OnClickLi
         view.findViewById(R.id.ok).setOnClickListener(this);
         view.findViewById(R.id.cancel).setOnClickListener(this);
         basalTypeRadioGroup.setOnCheckedChangeListener(this);
+
+        setCancelable(true);
+        getDialog().setCanceledOnTouchOutside(false);
         return view;
     }
 
@@ -155,7 +158,7 @@ public class NewTempBasalDialog extends DialogFragment implements View.OnClickLi
                                 }
                             };
                             if (setAsPercent) {
-                                ConfigBuilderPlugin.getCommandQueue().tempBasalPercent(finalBasalPercent, finalDurationInMinutes, callback);
+                                ConfigBuilderPlugin.getCommandQueue().tempBasalPercent(finalBasalPercent, finalDurationInMinutes, true, callback);
                             } else {
                                 ConfigBuilderPlugin.getCommandQueue().tempBasalAbsolute(finalBasal, finalDurationInMinutes, true, callback);
                             }

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

@@ -175,7 +175,7 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
         profileSpinner.setAdapter(adapter);
         // set selected to actual profile
         for (int p = 0; p < profileList.size(); p++) {
-            if (profileList.get(p).equals(MainApp.getConfigBuilder().getProfileName()))
+            if (profileList.get(p).equals(MainApp.getConfigBuilder().getProfileName(false)))
                 profileSpinner.setSelection(p);
         }
 
@@ -360,6 +360,8 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
         showOrHide((ViewGroup) view.findViewById(R.id.careportal_newnstreatment_reuse_layout), options.profile && ps != null && ps.isCPP);
         showOrHide((ViewGroup) view.findViewById(R.id.careportal_newnstreatment_temptarget_layout), options.tempTarget);
 
+        setCancelable(true);
+        getDialog().setCanceledOnTouchOutside(false);
         return view;
     }
 
@@ -532,7 +534,7 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
             if (options.eventType == R.id.careportal_combobolus) {
                 Double enteredInsulin = SafeParse.stringToDouble(editInsulin.getText());
                 data.put("enteredinsulin", enteredInsulin);
-                data.put("insulin", enteredInsulin * SafeParse.stringToDouble(editInsulin.getText()) / 100);
+                data.put("insulin", enteredInsulin * SafeParse.stringToDouble(editSplit.getText()) / 100);
                 data.put("relative", enteredInsulin * (100 - SafeParse.stringToDouble(editSplit.getText())) / 100 / SafeParse.stringToDouble(editDuration.getText()) * 60);
             }
         } catch (JSONException e) {

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

@@ -16,9 +16,9 @@ import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
+import info.nightscout.androidaps.data.Intervals;
 import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.MealData;
-import info.nightscout.androidaps.data.Intervals;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.ProfileIntervals;
 import info.nightscout.androidaps.data.PumpEnactResult;
@@ -38,8 +38,8 @@ import info.nightscout.androidaps.interfaces.SensitivityInterface;
 import info.nightscout.androidaps.interfaces.TreatmentsInterface;
 import info.nightscout.androidaps.plugins.Loop.APSResult;
 import info.nightscout.androidaps.plugins.Loop.LoopPlugin;
-import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.PumpVirtual.VirtualPumpPlugin;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.androidaps.queue.CommandQueue;
@@ -482,8 +482,7 @@ public class ConfigBuilderPlugin implements PluginBase, ConstraintsInterface, Tr
 
     @Override
     public boolean isAMAModeEnabled() {
-        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(MainApp.instance().getApplicationContext());
-        boolean result = preferences.getBoolean("openapsama_useautosens", false);
+        boolean result = SP.getBoolean("openapsama_useautosens", false);
 
         ArrayList<PluginBase> constraintsPlugins = MainApp.getSpecificPluginsListByInterface(ConstraintsInterface.class);
         for (PluginBase p : constraintsPlugins) {
@@ -494,6 +493,19 @@ public class ConfigBuilderPlugin implements PluginBase, ConstraintsInterface, Tr
         return result;
     }
 
+    @Override
+    public boolean isSMBModeEnabled() {
+        boolean result = true; // TODO update for SMB // SP.getBoolean("openapsama_useautosens", false);
+
+        ArrayList<PluginBase> constraintsPlugins = MainApp.getSpecificPluginsListByInterface(ConstraintsInterface.class);
+        for (PluginBase p : constraintsPlugins) {
+            ConstraintsInterface constrain = (ConstraintsInterface) p;
+            if (!p.isEnabled(PluginBase.CONSTRAINTS)) continue;
+            result = result && constrain.isSMBModeEnabled();
+        }
+        return result;
+    }
+
     @Override
     public Double applyBasalConstraints(Double absoluteRate) {
         Double rateAfterConstrain = absoluteRate;
@@ -736,6 +748,10 @@ public class ConfigBuilderPlugin implements PluginBase, ConstraintsInterface, Tr
         return getProfileName(System.currentTimeMillis());
     }
 
+    public String getProfileName(boolean customized) {
+        return getProfileName(System.currentTimeMillis(), customized);
+    }
+
     public String getProfileName(long time) {
         return getProfileName(time, true);
     }

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

@@ -14,9 +14,15 @@ import info.nightscout.androidaps.BuildConfig;
 import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.db.DatabaseHelper;
+import info.nightscout.androidaps.interfaces.APSInterface;
 import info.nightscout.androidaps.interfaces.ConstraintsInterface;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
+import info.nightscout.androidaps.plugins.ConstraintsSafety.SafetyPlugin;
+import info.nightscout.androidaps.plugins.Loop.LoopPlugin;
+import info.nightscout.androidaps.plugins.NSClientInternal.NSClientInternalPlugin;
+import info.nightscout.androidaps.plugins.PumpVirtual.VirtualPumpPlugin;
 import info.nightscout.utils.SP;
 
 /**
@@ -152,14 +158,37 @@ public class ObjectivesPlugin implements PluginBase, ConstraintsInterface {
     RequirementResult requirementsMet(Integer objNum) {
         switch (objNum) {
             case 0:
-                return new RequirementResult(bgIsAvailableInNS && pumpStatusIsAvailableInNS,
+                boolean isVirtualPump = VirtualPumpPlugin.getPlugin().isEnabled(PluginBase.PUMP);
+                boolean vpUploadEnabled = SP.getBoolean("virtualpump_uploadstatus", false);
+                boolean vpUploadNeeded = !isVirtualPump || vpUploadEnabled;
+                boolean hasBGData = DatabaseHelper.lastBg()!=null;
+
+                boolean apsEnabled = false;
+                APSInterface usedAPS = ConfigBuilderPlugin.getActiveAPS();
+                if (usedAPS != null && ((PluginBase) usedAPS).isEnabled(PluginBase.APS))
+                    apsEnabled = true;
+
+                return new RequirementResult(hasBGData&&bgIsAvailableInNS && pumpStatusIsAvailableInNS && NSClientInternalPlugin.getPlugin().hasWritePermission() && LoopPlugin.getPlugin().isEnabled(PluginBase.LOOP) && apsEnabled && vpUploadNeeded,
                         MainApp.sResources.getString(R.string.objectives_bgavailableinns) + ": " + yesOrNo(bgIsAvailableInNS)
-                                + " " + MainApp.sResources.getString(R.string.objectives_pumpstatusavailableinns) + ": " + yesOrNo(pumpStatusIsAvailableInNS));
+                                + "\n" + MainApp.sResources.getString(R.string.nsclienthaswritepermission) + ": " + yesOrNo(NSClientInternalPlugin.getPlugin().hasWritePermission())
+                                + (isVirtualPump ? "\n" + MainApp.sResources.getString(R.string.virtualpump_uploadstatus_title) + ": " + yesOrNo(vpUploadEnabled) : "")
+                                + "\n" + MainApp.sResources.getString(R.string.objectives_pumpstatusavailableinns) + ": " + yesOrNo(pumpStatusIsAvailableInNS)
+                                + "\n" + MainApp.sResources.getString(R.string.hasbgdata) + ": " + yesOrNo(hasBGData)
+                                + "\n" + MainApp.sResources.getString(R.string.loopenabled) + ": " + yesOrNo(LoopPlugin.getPlugin().isEnabled(PluginBase.LOOP))
+                                + "\n" + MainApp.sResources.getString(R.string.apsselected) + ": " + yesOrNo(apsEnabled)
+                );
             case 1:
                 return new RequirementResult(manualEnacts >= manualEnactsNeeded,
                         MainApp.sResources.getString(R.string.objectives_manualenacts) + ": " + manualEnacts + "/" + manualEnactsNeeded);
             case 2:
                 return new RequirementResult(true, "");
+            case 3:
+                boolean closedModeEnabled = SafetyPlugin.getPlugin().isClosedModeEnabled();
+                return new RequirementResult(closedModeEnabled, MainApp.sResources.getString(R.string.closedmodeenabled) + ": " + yesOrNo(closedModeEnabled));
+            case 4:
+                double maxIOB = MainApp.getConfigBuilder().applyMaxIOBConstraints(1000d);
+                boolean maxIobSet =  maxIOB > 0;
+                return new RequirementResult(maxIobSet, MainApp.sResources.getString(R.string.maxiobset) + ": " + yesOrNo(maxIobSet));
             default:
                 return new RequirementResult(true, "");
         }
@@ -212,7 +241,13 @@ public class ObjectivesPlugin implements PluginBase, ConstraintsInterface {
                 MainApp.sResources.getString(R.string.objectives_6_objective),
                 "",
                 new Date(0),
-                14,
+                28,
+                new Date(0)));
+        objectives.add(new Objective(7,
+                MainApp.sResources.getString(R.string.objectives_7_objective),
+                "",
+                new Date(0),
+                28,
                 new Date(0)));
     }
 
@@ -260,7 +295,7 @@ public class ObjectivesPlugin implements PluginBase, ConstraintsInterface {
      **/
     @Override
     public boolean isLoopEnabled() {
-        return objectives.get(1).started.getTime() > 0;
+        return objectives.get(0).started.getTime() > 0;
     }
 
     @Override
@@ -278,6 +313,11 @@ public class ObjectivesPlugin implements PluginBase, ConstraintsInterface {
         return objectives.get(6).started.getTime() > 0;
     }
 
+    @Override
+    public boolean isSMBModeEnabled() {
+        return objectives.get(7).started.getTime() > 0;
+    }
+
     @Override
     public Double applyMaxIOBConstraints(Double maxIob) {
         if (objectives.get(4).started.getTime() > 0 || objectives.get(2).accomplished.getTime() == 0)

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

@@ -116,6 +116,11 @@ public class SafetyPlugin implements PluginBase, ConstraintsInterface {
         return true;
     }
 
+    @Override
+    public boolean isSMBModeEnabled() {
+        return true;
+    }
+
     @Override
     public Double applyBasalConstraints(Double absoluteRate) {
         Double origAbsoluteRate = absoluteRate;

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

@@ -107,7 +107,7 @@ public class InsulinFastactingPlugin implements PluginBase, InsulinInterface {
     }
 
     @Override
-    public Iob iobCalcForTreatment(Treatment treatment, long time, Double dia) {
+    public Iob iobCalcForTreatment(Treatment treatment, long time, double dia) {
         Iob result = new Iob();
 
         double scaleFactor = 3.0 / dia;

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

@@ -107,7 +107,7 @@ public class InsulinFastactingProlongedPlugin implements PluginBase, InsulinInte
     }
 
     @Override
-    public Iob iobCalcForTreatment(Treatment treatment, long time, Double dia) {
+    public Iob iobCalcForTreatment(Treatment treatment, long time, double dia) {
         Iob result = new Iob();
 
         //Double scaleFactor = 3.0 / dia;

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

@@ -64,7 +64,7 @@ public abstract class InsulinOrefBasePlugin implements PluginBase, InsulinInterf
     }
 
     @Override
-    public Iob iobCalcForTreatment(Treatment treatment, long time, Double dia) {
+    public Iob iobCalcForTreatment(Treatment treatment, long time, double dia) {
         Iob result = new Iob();
 
         int peak = getPeak();

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

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.IobCobCalculator.events;
+package info.nightscout.androidaps.plugins.IobCobCalculator;
 
 /**
  * Created by mike on 10.06.2017.

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

@@ -31,7 +31,6 @@ import info.nightscout.androidaps.events.EventNewBasalProfile;
 import info.nightscout.androidaps.events.EventPreferenceChange;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.IobCobCalculator.events.BasalData;
 import info.nightscout.androidaps.plugins.IobCobCalculator.events.EventAutosensCalculationFinished;
 import info.nightscout.androidaps.plugins.IobCobCalculator.events.EventNewHistoryData;
 
@@ -364,6 +363,8 @@ public class IobCobCalculatorPlugin implements PluginBase {
                 // check if data already exists
                 long bgTime = bucketed_data.get(i).date;
                 bgTime = roundUpTime(bgTime);
+                if (bgTime > System.currentTimeMillis())
+                    continue;
                 Profile profile = MainApp.getConfigBuilder().getProfile(bgTime);
 
                 AutosensData existing;
@@ -544,6 +545,10 @@ public class IobCobCalculatorPlugin implements PluginBase {
                 //log.debug(">>> getAutosensData Cache hit " + data.log(time));
                 return data;
             } else {
+                if (time > now) {
+                    // data may not be calculated yet, use last data
+                    return getLastAutosensData();
+                }
                 //log.debug(">>> getAutosensData Cache miss " + new Date(time).toLocaleString());
                 return null;
             }
@@ -555,7 +560,7 @@ public class IobCobCalculatorPlugin implements PluginBase {
         if (autosensDataTable.size() < 1)
             return null;
         AutosensData data = autosensDataTable.valueAt(autosensDataTable.size() - 1);
-        if (data.time < System.currentTimeMillis() - 5 * 60 * 1000) {
+        if (data.time < System.currentTimeMillis() - 11 * 60 * 1000) {
             return null;
         } else {
             return data;

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

@@ -259,18 +259,6 @@ public class LoopPlugin implements PluginBase {
             if (!isEnabled(PluginBase.LOOP))
                 return;
 
-            if (isSuspended()) {
-                log.debug(MainApp.sResources.getString(R.string.loopsuspended));
-                MainApp.bus().post(new EventLoopSetLastRunGui(MainApp.sResources.getString(R.string.loopsuspended)));
-                return;
-            }
-
-            if (pump.isSuspended()) {
-                log.debug(MainApp.sResources.getString(R.string.pumpsuspended));
-                MainApp.bus().post(new EventLoopSetLastRunGui(MainApp.sResources.getString(R.string.pumpsuspended)));
-                return;
-            }
-
             if (MainApp.getConfigBuilder().getProfile() == null) {
                 log.debug(MainApp.sResources.getString(R.string.noprofileselected));
                 MainApp.bus().post(new EventLoopSetLastRunGui(MainApp.sResources.getString(R.string.noprofileselected)));
@@ -280,7 +268,7 @@ public class LoopPlugin implements PluginBase {
             // Check if pump info is loaded
             if (pump.getBaseBasalRate() < 0.01d) return;
 
-            APSInterface usedAPS = MainApp.getConfigBuilder().getActiveAPS();
+            APSInterface usedAPS = ConfigBuilderPlugin.getActiveAPS();
             if (usedAPS != null && ((PluginBase) usedAPS).isEnabled(PluginBase.APS)) {
                 usedAPS.invoke(initiator);
                 result = usedAPS.getLastAPSResult();
@@ -303,6 +291,20 @@ public class LoopPlugin implements PluginBase {
             lastRun.source = ((PluginBase) usedAPS).getName();
             lastRun.setByPump = null;
 
+            NSUpload.uploadDeviceStatus();
+
+            if (isSuspended()) {
+                log.debug(MainApp.sResources.getString(R.string.loopsuspended));
+                MainApp.bus().post(new EventLoopSetLastRunGui(MainApp.sResources.getString(R.string.loopsuspended)));
+                return;
+            }
+
+            if (pump.isSuspended()) {
+                log.debug(MainApp.sResources.getString(R.string.pumpsuspended));
+                MainApp.bus().post(new EventLoopSetLastRunGui(MainApp.sResources.getString(R.string.pumpsuspended)));
+                return;
+            }
+
             if (constraintsInterface.isClosedModeEnabled()) {
                 if (result.changeRequested) {
                     final PumpEnactResult waiting = new PumpEnactResult();
@@ -363,7 +365,6 @@ public class LoopPlugin implements PluginBase {
             }
 
             MainApp.bus().post(new EventLoopUpdateGui());
-            NSUpload.uploadDeviceStatus();
         } finally {
             if (Config.logFunctionCalls)
                 log.debug("invoke end");

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

@@ -222,4 +222,8 @@ public class NSClientInternalPlugin implements PluginBase {
     public String url() {
         return NSClientService.nsURL;
     }
+
+    public boolean hasWritePermission() {
+        return nsClientService.hasWriteAuth;
+    }
 }

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

@@ -96,6 +96,8 @@ public class UploadQueue {
     }
 
     public static void removeID(final String action, final String _id) {
+        if (_id == null || _id.equals(""))
+            return;
         startService();
         if (NSClientService.handler != null) {
             NSClientService.handler.post(new Runnable() {

app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java

@@ -1,10 +1,7 @@
 package info.nightscout.androidaps.plugins.NSClientInternal.broadcasts;
 
-import android.content.Context;
 import android.content.Intent;
-import android.content.pm.ResolveInfo;
 import android.os.Bundle;
-import android.os.TransactionTooLargeException;
 import android.support.v4.content.LocalBroadcastManager;
 
 import org.json.JSONArray;
@@ -19,9 +16,7 @@ import java.util.List;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.Services.Intents;
-import info.nightscout.androidaps.plugins.NSClientInternal.data.NSTreatment;
 import info.nightscout.utils.SP;
-import info.nightscout.utils.ToastUtils;
 
 /**
  * Created by mike on 20.02.2016.
@@ -29,11 +24,12 @@ import info.nightscout.utils.ToastUtils;
 public class BroadcastTreatment {
     private static Logger log = LoggerFactory.getLogger(BroadcastTreatment.class);
 
-    public static void handleNewTreatment(NSTreatment treatment, Context context, boolean isDelta) {
+    public static void handleNewTreatment(JSONObject treatment, boolean isDelta, boolean isLocalBypass) {
 
         Bundle bundle = new Bundle();
-        bundle.putString("treatment", treatment.getData().toString());
+        bundle.putString("treatment", treatment.toString());
         bundle.putBoolean("delta", isDelta);
+        bundle.putBoolean("islocal", isLocalBypass);
         Intent intent = new Intent(Intents.ACTION_NEW_TREATMENT);
         intent.putExtras(bundle);
         intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
@@ -41,16 +37,16 @@ public class BroadcastTreatment {
 
         if (SP.getBoolean(R.string.key_nsclient_localbroadcasts, true)) {
             bundle = new Bundle();
-            bundle.putString("treatment", treatment.getData().toString());
+            bundle.putString("treatment", treatment.toString());
             bundle.putBoolean("delta", isDelta);
             intent = new Intent(Intents.ACTION_NEW_TREATMENT);
             intent.putExtras(bundle);
             intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-            context.sendBroadcast(intent);
+            MainApp.instance().getApplicationContext().sendBroadcast(intent);
         }
     }
 
-    public static void handleNewTreatment(JSONArray treatments, Context context, boolean isDelta) {
+    public static void handleNewTreatment(JSONArray treatments, boolean isDelta) {
 
         List<JSONArray> splitted = splitArray(treatments);
         for (JSONArray part : splitted) {
@@ -72,12 +68,12 @@ public class BroadcastTreatment {
                 Intent intent = new Intent(Intents.ACTION_NEW_TREATMENT);
                 intent.putExtras(bundle);
                 intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-                context.sendBroadcast(intent);
+                MainApp.instance().getApplicationContext().sendBroadcast(intent);
             }
         }
     }
 
-    public void handleChangedTreatment(JSONObject treatment, Context context, boolean isDelta) {
+    public void handleChangedTreatment(JSONObject treatment, boolean isDelta) {
 
         Bundle bundle = new Bundle();
         bundle.putString("treatment", treatment.toString());
@@ -95,11 +91,11 @@ public class BroadcastTreatment {
             intent = new Intent(Intents.ACTION_CHANGED_TREATMENT);
             intent.putExtras(bundle);
             intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-            context.sendBroadcast(intent);
+            MainApp.instance().getApplicationContext().sendBroadcast(intent);
         }
     }
 
-    public static void handleChangedTreatment(JSONArray treatments, Context context, boolean isDelta) {
+    public static void handleChangedTreatment(JSONArray treatments, boolean isDelta) {
 
         List<JSONArray> splitted = splitArray(treatments);
         for (JSONArray part : splitted) {
@@ -121,12 +117,12 @@ public class BroadcastTreatment {
                 Intent intent = new Intent(Intents.ACTION_CHANGED_TREATMENT);
                 intent.putExtras(bundle);
                 intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-                context.sendBroadcast(intent);
+                MainApp.instance().getApplicationContext().sendBroadcast(intent);
             }
         }
     }
 
-    public static void handleRemovedTreatment(JSONObject treatment, Context context, boolean isDelta) {
+    public static void handleRemovedTreatment(JSONObject treatment, boolean isDelta) {
 
         Bundle bundle = new Bundle();
         bundle.putString("treatment", treatment.toString());
@@ -144,11 +140,11 @@ public class BroadcastTreatment {
             intent = new Intent(Intents.ACTION_REMOVED_TREATMENT);
             intent.putExtras(bundle);
             intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-            context.sendBroadcast(intent);
+            MainApp.instance().getApplicationContext().sendBroadcast(intent);
         }
     }
 
-    public static void handleRemovedTreatment(JSONArray treatments, Context context, boolean isDelta) {
+    public static void handleRemovedTreatment(JSONArray treatments, boolean isDelta) {
 
         Bundle bundle = new Bundle();
         bundle.putString("treatments", treatments.toString());
@@ -166,7 +162,7 @@ public class BroadcastTreatment {
             intent = new Intent(Intents.ACTION_REMOVED_TREATMENT);
             intent.putExtras(bundle);
             intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-            context.sendBroadcast(intent);
+            MainApp.instance().getApplicationContext().sendBroadcast(intent);
         }
     }
 

app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSSgv.java

@@ -63,5 +63,6 @@ public class NSSgv {
     public Long getMills () { return getLongOrNull("mills"); }
     public String getDevice () { return getStringOrNull("device"); }
     public String getDirection () { return getStringOrNull("direction"); }
+    public String getId () { return getStringOrNull("_id"); }
 
 }

app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/receivers/DBAccessReceiver.java

@@ -11,16 +11,14 @@ import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Date;
-
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.db.DbRequest;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSClientInternalPlugin;
 import info.nightscout.androidaps.plugins.NSClientInternal.UploadQueue;
-import info.nightscout.androidaps.db.DbRequest;
-import info.nightscout.androidaps.plugins.NSClientInternal.data.AlarmAck;
-import info.nightscout.androidaps.plugins.NSClientInternal.services.NSClientService;
+import info.nightscout.androidaps.plugins.NSClientInternal.broadcasts.BroadcastTreatment;
+import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.SP;
 
 public class DBAccessReceiver extends BroadcastReceiver {
@@ -32,14 +30,6 @@ public class DBAccessReceiver extends BroadcastReceiver {
         PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
         PowerManager.WakeLock wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK,
                 DBAccessReceiver.class.getSimpleName());
-        NSClientInternalPlugin nsClientInternalPlugin = MainApp.getSpecificPlugin(NSClientInternalPlugin.class);
-        if (!nsClientInternalPlugin.isEnabled(PluginBase.GENERAL)) {
-            return;
-        }
-        if (SP.getBoolean(R.string.key_ns_noupload, false)) {
-            log.debug("Upload disabled. Message dropped");
-            return;
-        }
         wakeLock.acquire();
         try {
             Bundle bundles = intent.getExtras();
@@ -85,12 +75,23 @@ public class DBAccessReceiver extends BroadcastReceiver {
             }
 
             if (action.equals("dbRemove")) {
+                if (shouldUpload()) {
                     DbRequest dbr = new DbRequest(action, collection, nsclientid.toString(), _id);
                     UploadQueue.add(dbr);
+                }
             } else {
                 DbRequest dbr = new DbRequest(action, collection, nsclientid.toString(), data);
+                // this is not used as mongo _id but only for searching in UploadQueue database
+                // if record has to be removed from queue before upload
+                dbr._id = nsclientid.toString();
+
+                if (shouldUpload()) {
                     UploadQueue.add(dbr);
                 }
+                if (collection.equals("treatments")) {
+                    genereateTreatmentOfflineBroadcast(dbr);
+                }
+            }
 
         } finally {
             wakeLock.release();
@@ -98,6 +99,24 @@ public class DBAccessReceiver extends BroadcastReceiver {
 
     }
 
+    public boolean shouldUpload() {
+        NSClientInternalPlugin nsClientInternalPlugin = MainApp.getSpecificPlugin(NSClientInternalPlugin.class);
+        return nsClientInternalPlugin.isEnabled(PluginBase.GENERAL) && !SP.getBoolean(R.string.key_ns_noupload, false);
+    }
+
+    public void genereateTreatmentOfflineBroadcast(DbRequest request) {
+        if (request.action.equals("dbAdd")) {
+            try {
+                JSONObject data = new JSONObject(request.data);
+                data.put("mills", DateUtil.fromISODateString(data.getString("created_at")).getTime());
+                data.put("_id", data.get("NSCLIENT_ID")); // this is only fake id
+                BroadcastTreatment.handleNewTreatment(data, false, true);
+            } catch (Exception e) {
+                log.error("Unhadled exception", e);
+            }
+        }
+    }
+
     private boolean isAllowedCollection(String collection) {
         // "treatments" || "entries" || "devicestatus" || "profile" || "food"
         if (collection.equals("treatments")) return true;

app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/services/NSClientService.java

@@ -52,15 +52,15 @@ import info.nightscout.androidaps.plugins.NSClientInternal.broadcasts.BroadcastS
 import info.nightscout.androidaps.plugins.NSClientInternal.broadcasts.BroadcastTreatment;
 import info.nightscout.androidaps.plugins.NSClientInternal.broadcasts.BroadcastUrgentAlarm;
 import info.nightscout.androidaps.plugins.NSClientInternal.data.AlarmAck;
-import info.nightscout.androidaps.plugins.NSClientInternal.data.NSSgv;
 import info.nightscout.androidaps.plugins.NSClientInternal.data.NSSettingsStatus;
+import info.nightscout.androidaps.plugins.NSClientInternal.data.NSSgv;
 import info.nightscout.androidaps.plugins.NSClientInternal.data.NSTreatment;
 import info.nightscout.androidaps.plugins.NSClientInternal.events.EventNSClientNewLog;
 import info.nightscout.androidaps.plugins.NSClientInternal.events.EventNSClientRestart;
 import info.nightscout.androidaps.plugins.NSClientInternal.events.EventNSClientStatus;
-import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.SP;
 import io.socket.client.IO;
@@ -114,6 +114,18 @@ public class NSClientService extends Service {
         initialize();
     }
 
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        mWakeLock.acquire();
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        mWakeLock.release();
+    }
+
     public class LocalBinder extends Binder {
         public NSClientService getServiceInstance() {
             return NSClientService.this;
@@ -182,8 +194,6 @@ public class NSClientService extends Service {
     public void initialize() {
         dataCounter = 0;
 
-        NSClientService.mWakeLock.acquire();
-
         readPreferences();
 
         if (!nsAPISecret.equals(""))
@@ -221,7 +231,6 @@ public class NSClientService extends Service {
             MainApp.bus().post(new EventNSClientNewLog("NSCLIENT", "No NS URL specified"));
             MainApp.bus().post(new EventNSClientStatus("Not configured"));
         }
-        NSClientService.mWakeLock.release();
     }
 
     private Emitter.Listener onConnect = new Emitter.Listener() {
@@ -242,6 +251,15 @@ public class NSClientService extends Service {
 
     public void destroy() {
         if (mSocket != null) {
+            mSocket.off(Socket.EVENT_CONNECT);
+            mSocket.off(Socket.EVENT_DISCONNECT);
+            mSocket.off(Socket.EVENT_PING);
+            mSocket.off("dataUpdate");
+            mSocket.off("announcement");
+            mSocket.off("alarm");
+            mSocket.off("urgent_alarm");
+            mSocket.off("clear_alarm");
+
             MainApp.bus().post(new EventNSClientNewLog("NSCLIENT", "destroy"));
             isConnected = false;
             hasWriteAuth = false;
@@ -524,13 +542,13 @@ public class NSClientService extends Service {
                                     }
                                 }
                                 if (removedTreatments.length() > 0) {
-                                    BroadcastTreatment.handleRemovedTreatment(removedTreatments, MainApp.instance().getApplicationContext(), isDelta);
+                                    BroadcastTreatment.handleRemovedTreatment(removedTreatments, isDelta);
                                 }
                                 if (updatedTreatments.length() > 0) {
-                                    BroadcastTreatment.handleChangedTreatment(updatedTreatments, MainApp.instance().getApplicationContext(), isDelta);
+                                    BroadcastTreatment.handleChangedTreatment(updatedTreatments, isDelta);
                                 }
                                 if (addedTreatments.length() > 0) {
-                                    BroadcastTreatment.handleNewTreatment(addedTreatments, MainApp.instance().getApplicationContext(), isDelta);
+                                    BroadcastTreatment.handleNewTreatment(addedTreatments, isDelta);
                                 }
                             }
                             if (data.has("devicestatus")) {

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

@@ -248,9 +248,11 @@ public class OpenAPSAMAPlugin implements PluginBase, APSInterface {
             determineBasalResultAMA.changeRequested = false;
         // limit requests on openloop mode
         if (!MainApp.getConfigBuilder().isClosedModeEnabled()) {
-            if (MainApp.getConfigBuilder().isTempBasalInProgress() && Math.abs(determineBasalResultAMA.rate - MainApp.getConfigBuilder().getTempBasalAbsoluteRateHistory()) < 0.1)
+            if (MainApp.getConfigBuilder().isTempBasalInProgress() && determineBasalResultAMA.rate == 0 && determineBasalResultAMA.duration == 0) {
+                // going to cancel
+            } else if (MainApp.getConfigBuilder().isTempBasalInProgress() && Math.abs(determineBasalResultAMA.rate - MainApp.getConfigBuilder().getTempBasalAbsoluteRateHistory()) < 0.1) {
                 determineBasalResultAMA.changeRequested = false;
-            if (!MainApp.getConfigBuilder().isTempBasalInProgress() && Math.abs(determineBasalResultAMA.rate - ConfigBuilderPlugin.getActivePump().getBaseBasalRate()) < 0.1)
+            } else if (!MainApp.getConfigBuilder().isTempBasalInProgress() && Math.abs(determineBasalResultAMA.rate - ConfigBuilderPlugin.getActivePump().getBaseBasalRate()) < 0.1)
                 determineBasalResultAMA.changeRequested = false;
         }
 

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

@@ -232,9 +232,11 @@ public class OpenAPSMAPlugin implements PluginBase, APSInterface {
             determineBasalResultMA.changeRequested = false;
         // limit requests on openloop mode
         if (!MainApp.getConfigBuilder().isClosedModeEnabled()) {
-            if (MainApp.getConfigBuilder().isTempBasalInProgress() && Math.abs(determineBasalResultMA.rate - MainApp.getConfigBuilder().getTempBasalAbsoluteRateHistory()) < 0.1)
+            if (MainApp.getConfigBuilder().isTempBasalInProgress() && determineBasalResultMA.rate == 0 && determineBasalResultMA.duration == 0) {
+                // going to cancel
+            } else if (MainApp.getConfigBuilder().isTempBasalInProgress() && Math.abs(determineBasalResultMA.rate - MainApp.getConfigBuilder().getTempBasalAbsoluteRateHistory()) < 0.1) {
                 determineBasalResultMA.changeRequested = false;
-            if (!MainApp.getConfigBuilder().isTempBasalInProgress() && Math.abs(determineBasalResultMA.rate - ConfigBuilderPlugin.getActivePump().getBaseBasalRate()) < 0.1)
+            } else if (!MainApp.getConfigBuilder().isTempBasalInProgress() && Math.abs(determineBasalResultMA.rate - ConfigBuilderPlugin.getActivePump().getBaseBasalRate()) < 0.1)
                 determineBasalResultMA.changeRequested = false;
         }
 

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

@@ -76,6 +76,8 @@ public class CalibrationDialog extends DialogFragment implements View.OnClickLis
         unitsView = (TextView) view.findViewById(R.id.overview_calibration_units);
         unitsView.setText(units);
 
+        setCancelable(true);
+        getDialog().setCanceledOnTouchOutside(false);
         return view;
     }
 

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

@@ -9,7 +9,6 @@ import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.ArrayAdapter;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Spinner;
 
@@ -17,13 +16,13 @@ import org.json.JSONException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.data.QuickWizard;
+import info.nightscout.androidaps.data.QuickWizardEntry;
 import info.nightscout.androidaps.plugins.Overview.OverviewPlugin;
-import info.nightscout.androidaps.plugins.Overview.QuickWizard;
 import info.nightscout.androidaps.plugins.Overview.events.EventQuickWizardChange;
 import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.SafeParse;
@@ -31,19 +30,25 @@ import info.nightscout.utils.SafeParse;
 public class EditQuickWizardDialog extends DialogFragment implements View.OnClickListener {
     private static Logger log = LoggerFactory.getLogger(EditQuickWizardDialog.class);
 
-    QuickWizard.QuickWizardEntry entry = new QuickWizard().newEmptyItem();
+    QuickWizardEntry entry = new QuickWizard().newEmptyItem();
     QuickWizard quickWizard = MainApp.getSpecificPlugin(OverviewPlugin.class).quickWizard;
 
     EditText buttonEdit;
     EditText carbsEdit;
     Spinner fromSpinner;
     Spinner toSpinner;
-    Button okButton;
+    Spinner useBGSpinner;
+    Spinner useCOBSpinner;
+    Spinner useBolusIOBSpinner;
+    Spinner useBasalIOBSpinner;
+    Spinner useTrendSpinner;
+    Spinner useSuperBolusSpinner;
+    Spinner useTempTargetSpinner;
 
     public EditQuickWizardDialog() {
     }
 
-    public void setData(QuickWizard.QuickWizardEntry data) {
+    public void setData(QuickWizardEntry data) {
         entry = data;
     }
 
@@ -58,8 +63,16 @@ public class EditQuickWizardDialog extends DialogFragment implements View.OnClic
         carbsEdit = (EditText) view.findViewById(R.id.overview_editquickwizard_carbs_edit);
         fromSpinner = (Spinner) view.findViewById(R.id.overview_editquickwizard_from_spinner);
         toSpinner = (Spinner) view.findViewById(R.id.overview_editquickwizard_to_spinner);
-        okButton = (Button) view.findViewById(R.id.overview_editquickwizard_ok_button);
-        okButton.setOnClickListener(this);
+        useBGSpinner = (Spinner) view.findViewById(R.id.overview_editquickwizard_usebg_spinner);
+        useCOBSpinner = (Spinner) view.findViewById(R.id.overview_editquickwizard_usecob_spinner);
+        useBolusIOBSpinner = (Spinner) view.findViewById(R.id.overview_editquickwizard_usebolusiob_spinner);
+        useBasalIOBSpinner = (Spinner) view.findViewById(R.id.overview_editquickwizard_usebasaliob_spinner);
+        useTrendSpinner = (Spinner) view.findViewById(R.id.overview_editquickwizard_usetrend_spinner);
+        useSuperBolusSpinner = (Spinner) view.findViewById(R.id.overview_editquickwizard_usesuperbolus_spinner);
+        useTempTargetSpinner = (Spinner) view.findViewById(R.id.overview_editquickwizard_usetemptarget_spinner);
+
+        view.findViewById(R.id.ok).setOnClickListener(this);
+        view.findViewById(R.id.cancel).setOnClickListener(this);
 
         int posFrom = 0;
         int posTo = 95;
@@ -83,6 +96,14 @@ public class EditQuickWizardDialog extends DialogFragment implements View.OnClic
         fromSpinner.setSelection(posFrom);
         toSpinner.setSelection(posTo);
 
+        setSelection(useBGSpinner, entry.useBG());
+        setSelection(useCOBSpinner, entry.useCOB());
+        setSelection(useBolusIOBSpinner, entry.useBolusIOB());
+        setSelection(useBasalIOBSpinner, entry.useBasalIOB());
+        setSelection(useTrendSpinner, entry.useTrend());
+        setSelection(useSuperBolusSpinner, entry.useSuperBolus());
+        setSelection(useTempTargetSpinner, entry.useTempTarget());
+
         return view;
     }
 
@@ -96,7 +117,7 @@ public class EditQuickWizardDialog extends DialogFragment implements View.OnClic
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
-            case R.id.overview_editquickwizard_ok_button:
+            case R.id.ok:
                 if (fromSpinner.getSelectedItem() == null) return;
                 if (toSpinner.getSelectedItem() == null) return;
                 try {
@@ -106,6 +127,13 @@ public class EditQuickWizardDialog extends DialogFragment implements View.OnClic
                     entry.storage.put("validFrom", validFromInt);
                     int validToInt = DateUtil.toSeconds(toSpinner.getSelectedItem().toString());
                     entry.storage.put("validTo", validToInt);
+                    entry.storage.put("useBG", getSelection(useBGSpinner));
+                    entry.storage.put("useCOB", getSelection(useCOBSpinner));
+                    entry.storage.put("useBolusIOB", getSelection(useBolusIOBSpinner));
+                    entry.storage.put("useBasalIOB", getSelection(useBasalIOBSpinner));
+                    entry.storage.put("useTrend", getSelection(useTrendSpinner));
+                    entry.storage.put("useSuperBolus", getSelection(useSuperBolusSpinner));
+                    entry.storage.put("useTempTarget", getSelection(useTempTargetSpinner));
                 } catch (JSONException e) {
                     log.error("Unhandled exception", e);
                 }
@@ -113,6 +141,50 @@ public class EditQuickWizardDialog extends DialogFragment implements View.OnClic
                 dismiss();
                 MainApp.bus().post(new EventQuickWizardChange());
                 break;
+            case R.id.cancel:
+                dismiss();
+                break;
+        }
+    }
+
+    int getSelection(Spinner spinner) {
+        String value = spinner.getSelectedItem().toString();
+        if (value.equals(MainApp.sResources.getString(R.string.yes)))
+            return QuickWizardEntry.YES;
+        if (value.equals(MainApp.sResources.getString(R.string.no)))
+            return QuickWizardEntry.NO;
+        if (value.equals(MainApp.sResources.getString(R.string.positiveonly)))
+            return QuickWizardEntry.POSITIVE_ONLY;
+        if (value.equals(MainApp.sResources.getString(R.string.negativeonly)))
+            return QuickWizardEntry.NEGATIVE_ONLY;
+        return QuickWizardEntry.NO;
+    }
+
+    void setSelection(Spinner spinner, int value) {
+        String selection;
+        switch (value) {
+            case QuickWizardEntry.YES:
+                selection = MainApp.sResources.getString(R.string.yes);
+                break;
+            case QuickWizardEntry.NO:
+                selection = MainApp.sResources.getString(R.string.no);
+                break;
+            case QuickWizardEntry.POSITIVE_ONLY:
+                selection = MainApp.sResources.getString(R.string.positiveonly);
+                break;
+            case QuickWizardEntry.NEGATIVE_ONLY:
+                selection = MainApp.sResources.getString(R.string.negativeonly);
+                break;
+            default:
+                selection = MainApp.sResources.getString(R.string.no);
+                break;
+        }
+
+        for (int i = 0; i < spinner.getCount(); i++) {
+            if (spinner.getItemAtPosition(i).toString().equalsIgnoreCase(selection)) {
+                spinner.setSelection(i);
+                break;
+            }
         }
     }
 }

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

@@ -102,6 +102,8 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
         editCarbs.setParams(0d, 0d, (double) maxCarbs, 1d, new DecimalFormat("0"), false, textWatcher);
         editInsulin.setParams(0d, 0d, maxInsulin, ConfigBuilderPlugin.getActivePump().getPumpDescription().bolusStep, new DecimalFormat("0.00"), false, textWatcher);
 
+        setCancelable(true);
+        getDialog().setCanceledOnTouchOutside(false);
         return view;
     }
 

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

@@ -53,6 +53,8 @@ import info.nightscout.androidaps.db.TempTarget;
 import info.nightscout.androidaps.events.EventNewBG;
 import info.nightscout.androidaps.events.EventRefreshOverview;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
+import info.nightscout.androidaps.plugins.IobCobCalculator.AutosensData;
+import info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.plugins.Loop.LoopPlugin;
 import info.nightscout.androidaps.plugins.OpenAPSAMA.OpenAPSAMAPlugin;
 import info.nightscout.androidaps.plugins.OpenAPSMA.events.EventOpenAPSUpdateGui;
@@ -102,7 +104,6 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
     Integer calculatedCarbs = 0;
     Double calculatedTotalInsulin = 0d;
     JSONObject boluscalcJSON;
-    boolean cobAvailable = false;
 
     Context context;
 
@@ -138,25 +139,6 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
         MainApp.bus().unregister(this);
     }
 
-    @Subscribe
-    public void onStatusEvent(final EventOpenAPSUpdateGui e) {
-        Activity activity = getActivity();
-        if (activity != null)
-            activity.runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    if (ConfigBuilderPlugin.getActiveAPS() instanceof OpenAPSAMAPlugin && ConfigBuilderPlugin.getActiveAPS().getLastAPSResult() != null && ConfigBuilderPlugin.getActiveAPS().getLastAPSRun().after(new Date(System.currentTimeMillis() - 11 * 60 * 1000L))) {
-                        cobLayout.setVisibility(View.VISIBLE);
-                        cobAvailable = true;
-                    } else {
-                        cobLayout.setVisibility(View.GONE);
-                        cobAvailable = false;
-                    }
-                    calculateInsulin();
-                }
-            });
-    }
-
     @Subscribe
     public void onStatusEvent(final EventNewBG e) {
         Activity activity = getActivity();
@@ -251,6 +233,8 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
         editCarbTime.setParams(0d, -60d, 60d, 5d, new DecimalFormat("0"), false);
         initDialog();
 
+        setCancelable(true);
+        getDialog().setCanceledOnTouchOutside(false);
         return view;
     }
 
@@ -344,7 +328,7 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
                                             activeloop.superBolusTo(System.currentTimeMillis() + 2 * 60L * 60 * 1000);
                                             MainApp.bus().post(new EventRefreshOverview("WizardDialog"));
                                         }
-                                        ConfigBuilderPlugin.getCommandQueue().tempBasalAbsolute(0d, 120, true, new Callback() {
+                                        ConfigBuilderPlugin.getCommandQueue().tempBasalPercent(0, 120, true, new Callback() {
                                             @Override
                                             public void run() {
                                                 if (!result.success) {
@@ -438,14 +422,6 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
         bolusIobInsulin.setText(DecimalFormatter.to2Decimal(-bolusIob.iob) + "U");
         basalIobInsulin.setText(DecimalFormatter.to2Decimal(-basalIob.basaliob) + "U");
 
-        // COB only if AMA is selected
-        if (ConfigBuilderPlugin.getActiveAPS() instanceof OpenAPSAMAPlugin && ConfigBuilderPlugin.getActiveAPS().getLastAPSResult() != null && ConfigBuilderPlugin.getActiveAPS().getLastAPSRun().after(new Date(System.currentTimeMillis() - 11 * 60 * 1000L))) {
-            cobLayout.setVisibility(View.VISIBLE);
-            cobAvailable = true;
-        } else {
-            cobLayout.setVisibility(View.GONE);
-            cobAvailable = false;
-        }
         calculateInsulin();
     }
 
@@ -482,13 +458,11 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
 
         // COB
         Double c_cob = 0d;
-        if (cobAvailable && cobCheckbox.isChecked()) {
-            if (ConfigBuilderPlugin.getActiveAPS().getLastAPSResult() != null && ConfigBuilderPlugin.getActiveAPS().getLastAPSRun().after(new Date(System.currentTimeMillis() - 11 * 60 * 1000L))) {
-                try {
-                    c_cob = SafeParse.stringToDouble(ConfigBuilderPlugin.getActiveAPS().getLastAPSResult().json().getString("COB"));
-                } catch (JSONException e) {
-                    log.error("Unhandled exception", e);
-                }
+        if (cobCheckbox.isChecked()) {
+            AutosensData autosensData = IobCobCalculatorPlugin.getLastAutosensData();
+
+            if(autosensData != null) {
+                c_cob = autosensData.cob;
             }
         }
 
@@ -530,7 +504,7 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
         bgTrendInsulin.setText(DecimalFormatter.to2Decimal(wizard.insulinFromTrend) + "U");
 
         // COB
-        if (cobAvailable && cobCheckbox.isChecked()) {
+        if (cobCheckbox.isChecked()) {
             cob.setText(DecimalFormatter.to2Decimal(c_cob) + "g IC: " + DecimalFormatter.to1Decimal(wizard.ic));
             cobInsulin.setText(DecimalFormatter.to2Decimal(wizard.insulinFromCOB) + "U");
         } else {

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

@@ -11,6 +11,7 @@ import android.graphics.Paint;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog;
@@ -52,7 +53,6 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
-import info.nightscout.androidaps.BuildConfig;
 import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
@@ -61,6 +61,7 @@ import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.GlucoseStatus;
 import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.Profile;
+import info.nightscout.androidaps.data.QuickWizardEntry;
 import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.db.DatabaseHelper;
@@ -78,6 +79,7 @@ import info.nightscout.androidaps.events.EventTempBasalChange;
 import info.nightscout.androidaps.events.EventTempTargetChange;
 import info.nightscout.androidaps.events.EventTreatmentChange;
 import info.nightscout.androidaps.interfaces.PluginBase;
+import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.Careportal.CareportalFragment;
 import info.nightscout.androidaps.plugins.Careportal.Dialogs.NewNSTreatmentDialog;
@@ -97,6 +99,7 @@ import info.nightscout.androidaps.plugins.Overview.Dialogs.CalibrationDialog;
 import info.nightscout.androidaps.plugins.Overview.Dialogs.ErrorHelperActivity;
 import info.nightscout.androidaps.plugins.Overview.Dialogs.NewTreatmentDialog;
 import info.nightscout.androidaps.plugins.Overview.Dialogs.WizardDialog;
+import info.nightscout.androidaps.plugins.Overview.activities.QuickWizardListActivity;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventSetWakeLock;
 import info.nightscout.androidaps.plugins.Overview.graphData.GraphData;
@@ -112,9 +115,10 @@ import info.nightscout.utils.NSUpload;
 import info.nightscout.utils.OKDialog;
 import info.nightscout.utils.Profiler;
 import info.nightscout.utils.SP;
+import info.nightscout.utils.SingleClickButton;
 import info.nightscout.utils.ToastUtils;
 
-public class OverviewFragment extends Fragment implements View.OnClickListener, CompoundButton.OnCheckedChangeListener {
+public class OverviewFragment extends Fragment implements View.OnClickListener, CompoundButton.OnCheckedChangeListener, View.OnLongClickListener {
     private static Logger log = LoggerFactory.getLogger(OverviewFragment.class);
 
     TextView timeView;
@@ -155,11 +159,11 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
     LinearLayoutManager llm;
 
     LinearLayout acceptTempLayout;
-    Button treatmentButton;
-    Button wizardButton;
-    Button calibrationButton;
-    Button acceptTempButton;
-    Button quickWizardButton;
+    SingleClickButton treatmentButton;
+    SingleClickButton wizardButton;
+    SingleClickButton calibrationButton;
+    SingleClickButton acceptTempButton;
+    SingleClickButton quickWizardButton;
 
     CheckBox lockScreen;
 
@@ -175,6 +179,8 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
     Handler sLoopHandler = new Handler();
     Runnable sRefreshLoop = null;
 
+    final Object updateSync = new Object();
+
     private static final ScheduledExecutorService worker = Executors.newSingleThreadScheduledExecutor();
     private static ScheduledFuture<?> scheduledUpdate = null;
 
@@ -243,16 +249,17 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             bgGraph = (GraphView) view.findViewById(R.id.overview_bggraph);
             iobGraph = (GraphView) view.findViewById(R.id.overview_iobgraph);
 
-            treatmentButton = (Button) view.findViewById(R.id.overview_treatmentbutton);
+            treatmentButton = (SingleClickButton) view.findViewById(R.id.overview_treatmentbutton);
             treatmentButton.setOnClickListener(this);
-            wizardButton = (Button) view.findViewById(R.id.overview_wizardbutton);
+            wizardButton = (SingleClickButton) view.findViewById(R.id.overview_wizardbutton);
             wizardButton.setOnClickListener(this);
-            acceptTempButton = (Button) view.findViewById(R.id.overview_accepttempbutton);
+            acceptTempButton = (SingleClickButton) view.findViewById(R.id.overview_accepttempbutton);
             if (acceptTempButton != null)
                 acceptTempButton.setOnClickListener(this);
-            quickWizardButton = (Button) view.findViewById(R.id.overview_quickwizardbutton);
+            quickWizardButton = (SingleClickButton) view.findViewById(R.id.overview_quickwizardbutton);
             quickWizardButton.setOnClickListener(this);
-            calibrationButton = (Button) view.findViewById(R.id.overview_calibrationbutton);
+            quickWizardButton.setOnLongClickListener(this);
+            calibrationButton = (SingleClickButton) view.findViewById(R.id.overview_calibrationbutton);
             if (calibrationButton != null)
                 calibrationButton.setOnClickListener(this);
 
@@ -319,6 +326,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             return view;
         } catch (Exception e) {
             Crashlytics.logException(e);
+            log.debug("Runtime Exception", e);
         }
 
         return null;
@@ -330,6 +338,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         super.onCreateContextMenu(menu, v, menuInfo);
         if (v == apsModeView) {
             final LoopPlugin activeloop = ConfigBuilderPlugin.getActiveLoop();
+            final PumpDescription pumpDescription = ConfigBuilderPlugin.getActivePump().getPumpDescription();
             if (activeloop == null)
                 return;
             menu.setHeaderTitle(MainApp.sResources.getString(R.string.loop));
@@ -340,6 +349,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                     menu.add(MainApp.sResources.getString(R.string.suspendloopfor2h));
                     menu.add(MainApp.sResources.getString(R.string.suspendloopfor3h));
                     menu.add(MainApp.sResources.getString(R.string.suspendloopfor10h));
+                    if (pumpDescription.tempDurationStep <= 30)
                         menu.add(MainApp.sResources.getString(R.string.disconnectpumpfor30m));
                     menu.add(MainApp.sResources.getString(R.string.disconnectpumpfor1h));
                     menu.add(MainApp.sResources.getString(R.string.disconnectpumpfor2h));
@@ -479,7 +489,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         } else if (item.getTitle().equals(MainApp.sResources.getString(R.string.disconnectpumpfor30m))) {
             activeloop.disconnectTo(System.currentTimeMillis() + 30L * 60 * 1000);
             updateGUI("suspendmenu");
-            ConfigBuilderPlugin.getCommandQueue().tempBasalAbsolute(0d, 30, true, new Callback() {
+            ConfigBuilderPlugin.getCommandQueue().tempBasalPercent(0, 30, true, new Callback() {
                 @Override
                 public void run() {
                     if (!result.success) {
@@ -492,7 +502,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         } else if (item.getTitle().equals(MainApp.sResources.getString(R.string.disconnectpumpfor1h))) {
             activeloop.disconnectTo(System.currentTimeMillis() + 1 * 60L * 60 * 1000);
             updateGUI("suspendmenu");
-            ConfigBuilderPlugin.getCommandQueue().tempBasalAbsolute(0d, 60, true, new Callback() {
+            ConfigBuilderPlugin.getCommandQueue().tempBasalPercent(0, 60, true, new Callback() {
                 @Override
                 public void run() {
                     if (!result.success) {
@@ -505,7 +515,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         } else if (item.getTitle().equals(MainApp.sResources.getString(R.string.disconnectpumpfor2h))) {
             activeloop.disconnectTo(System.currentTimeMillis() + 2 * 60L * 60 * 1000);
             updateGUI("suspendmenu");
-            ConfigBuilderPlugin.getCommandQueue().tempBasalAbsolute(0d, 2 * 60, true, new Callback() {
+            ConfigBuilderPlugin.getCommandQueue().tempBasalPercent(0, 2 * 60, true, new Callback() {
                 @Override
                 public void run() {
                     if (!result.success) {
@@ -518,7 +528,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         } else if (item.getTitle().equals(MainApp.sResources.getString(R.string.disconnectpumpfor3h))) {
             activeloop.disconnectTo(System.currentTimeMillis() + 3 * 60L * 60 * 1000);
             updateGUI("suspendmenu");
-            ConfigBuilderPlugin.getCommandQueue().tempBasalAbsolute(0d, 3 * 60, true, new Callback() {
+            ConfigBuilderPlugin.getCommandQueue().tempBasalPercent(0, 3 * 60, true, new Callback() {
                 @Override
                 public void run() {
                     if (!result.success) {
@@ -573,6 +583,17 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
 
     }
 
+    @Override
+    public boolean onLongClick(View v) {
+        switch (v.getId()) {
+            case R.id.overview_quickwizardbutton:
+                Intent i = new Intent(v.getContext(), QuickWizardListActivity.class);
+                startActivity(i);
+                return true;
+        }
+        return false;
+    }
+
     private void onClickAcceptTemp() {
         if (ConfigBuilderPlugin.getActiveLoop() != null) {
             ConfigBuilderPlugin.getActiveLoop().invoke("Accept temp button", false);
@@ -616,11 +637,10 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         final Profile profile = MainApp.getConfigBuilder().getProfile();
         final TempTarget tempTarget = MainApp.getConfigBuilder().getTempTargetFromHistory();
 
-        QuickWizard.QuickWizardEntry quickWizardEntry = OverviewPlugin.getPlugin().quickWizard.getActive();
+        final QuickWizardEntry quickWizardEntry = OverviewPlugin.getPlugin().quickWizard.getActive();
         if (quickWizardEntry != null && actualBg != null) {
             quickWizardButton.setVisibility(View.VISIBLE);
-            BolusWizard wizard = new BolusWizard();
-            wizard.doCalc(profile, tempTarget, quickWizardEntry.carbs(), 0d, actualBg.valueToUnits(profile.getUnits()), 0d, true, true, false, false);
+            final BolusWizard wizard = quickWizardEntry.doCalc(profile, tempTarget, actualBg);
 
             final JSONObject boluscalcJSON = new JSONObject();
             try {
@@ -679,6 +699,26 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                             }
                             accepted = true;
                             if (finalInsulinAfterConstraints > 0 || finalCarbsAfterConstraints > 0) {
+                                if (wizard.superBolus) {
+                                    final LoopPlugin activeloop = ConfigBuilderPlugin.getActiveLoop();
+                                    if (activeloop != null) {
+                                        activeloop.superBolusTo(System.currentTimeMillis() + 2 * 60L * 60 * 1000);
+                                        MainApp.bus().post(new EventRefreshOverview("WizardDialog"));
+                                    }
+                                    ConfigBuilderPlugin.getCommandQueue().tempBasalPercent(0, 120, true, new Callback() {
+                                        @Override
+                                        public void run() {
+                                            if (!result.success) {
+                                                Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
+                                                i.putExtra("soundid", R.raw.boluserror);
+                                                i.putExtra("status", result.comment);
+                                                i.putExtra("title", MainApp.sResources.getString(R.string.tempbasaldeliveryerror));
+                                                i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                                                MainApp.instance().startActivity(i);
+                                            }
+                                        }
+                                    });
+                                }
                                 DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo();
                                 detailedBolusInfo.eventType = CareportalEvent.BOLUSWIZARD;
                                 detailedBolusInfo.insulin = finalInsulinAfterConstraints;
@@ -864,9 +904,9 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
     }
 
     @SuppressLint("SetTextI18n")
-    public void updateGUI(String from) {
+    public void updateGUI(final String from) {
         log.debug("updateGUI entered from: " + from);
-        Date updateGUIStart = new Date();
+        final Date updateGUIStart = new Date();
 
         if (getActivity() == null)
             return;
@@ -888,7 +928,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         BgReading actualBG = DatabaseHelper.actualBg();
         BgReading lastBG = DatabaseHelper.lastBg();
 
-        PumpInterface pump = ConfigBuilderPlugin.getActivePump();
+        final PumpInterface pump = ConfigBuilderPlugin.getActivePump();
 
         Profile profile = MainApp.getConfigBuilder().getProfile();
         String units = profile.getUnits();
@@ -900,8 +940,16 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             return;
         }
 
-        double lowLine = SP.getDouble("low_mark", 0d);
-        double highLine = SP.getDouble("high_mark", 0d);
+        double lowLineSetting = SP.getDouble("low_mark", Profile.fromMgdlToUnits(OverviewPlugin.bgTargetLow, units));
+        double highLineSetting = SP.getDouble("high_mark", Profile.fromMgdlToUnits(OverviewPlugin.bgTargetHigh, units));
+
+        if (lowLineSetting < 1)
+            lowLineSetting = Profile.fromMgdlToUnits(76d, units);
+        if (highLineSetting < 1)
+            highLineSetting = Profile.fromMgdlToUnits(180d, units);
+
+        final double lowLine = lowLineSetting;
+        final double highLine = highLineSetting;
 
         //Start with updating the BG as it is unaffected by loop.
         // **** BG value ****
@@ -1083,12 +1131,11 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         tempTargetView.setLongClickable(true);
 
         // QuickWizard button
-        QuickWizard.QuickWizardEntry quickWizardEntry = OverviewPlugin.getPlugin().quickWizard.getActive();
+        QuickWizardEntry quickWizardEntry = OverviewPlugin.getPlugin().quickWizard.getActive();
         if (quickWizardEntry != null && lastBG != null && pump.isInitialized() && !pump.isSuspended()) {
             quickWizardButton.setVisibility(View.VISIBLE);
             String text = quickWizardEntry.buttonText() + "\n" + DecimalFormatter.to0Decimal(quickWizardEntry.carbs()) + "g";
-            BolusWizard wizard = new BolusWizard();
-            wizard.doCalc(profile, tempTarget, quickWizardEntry.carbs(), 0d, lastBG.valueToUnits(units), 0d, true, true, false, false);
+            BolusWizard wizard = quickWizardEntry.doCalc(profile, tempTarget, lastBG);
             text += " " + DecimalFormatter.to2Decimal(wizard.calculatedTotalInsulin) + "U";
             quickWizardButton.setText(text);
             if (wizard.calculatedTotalInsulin <= 0)
@@ -1106,16 +1153,8 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         }
 
 
-        if (lowLine < 1) {
-            lowLine = Profile.fromMgdlToUnits(OverviewPlugin.bgTargetLow, units);
-        }
-        if (highLine < 1) {
-            highLine = Profile.fromMgdlToUnits(OverviewPlugin.bgTargetHigh, units);
-        }
-
         // **** BG value ****
         if (lastBG == null) { //left this here as it seems you want to exit at this point if it is null...
-
             return;
         }
         Integer flag = bgView.getPaintFlags();
@@ -1162,13 +1201,13 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         // cob
         if (cobView != null) { // view must not exists
             String cobText = "";
-            AutosensData autosensData = IobCobCalculatorPlugin.getAutosensData(System.currentTimeMillis());
+            AutosensData autosensData = IobCobCalculatorPlugin.getLastAutosensData();
             if (autosensData != null)
                 cobText = (int) autosensData.cob + " g";
             cobView.setText(cobText);
         }
 
-        boolean showPrediction = showPredictionView.isChecked() && finalLastRun != null && finalLastRun.constraintsProcessed.getClass().equals(DetermineBasalResultAMA.class);
+        final boolean showPrediction = showPredictionView.isChecked() && finalLastRun != null && finalLastRun.constraintsProcessed.getClass().equals(DetermineBasalResultAMA.class);
         if (MainApp.getSpecificPlugin(OpenAPSAMAPlugin.class) != null && MainApp.getSpecificPlugin(OpenAPSAMAPlugin.class).isEnabled(PluginBase.APS)) {
             showPredictionView.setVisibility(View.VISIBLE);
             getActivity().findViewById(R.id.overview_showprediction_label).setVisibility(View.VISIBLE);
@@ -1212,6 +1251,9 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
 
         // ****** GRAPH *******
 
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
                 // allign to hours
                 Calendar calendar = Calendar.getInstance();
                 calendar.setTimeInMillis(System.currentTimeMillis());
@@ -1221,9 +1263,9 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 calendar.add(Calendar.HOUR, 1);
 
                 int hoursToFetch;
-        long toTime;
-        long fromTime;
-        long endTime;
+                final long toTime;
+                final long fromTime;
+                final long endTime;
                 if (showPrediction) {
                     int predHours = (int) (Math.ceil(((DetermineBasalResultAMA) finalLastRun.constraintsProcessed).getLatestPredictionsTime() - System.currentTimeMillis()) / (60 * 60 * 1000));
                     predHours = Math.min(2, predHours);
@@ -1240,13 +1282,40 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 }
 
 
-        long now = System.currentTimeMillis();
+                final long now = System.currentTimeMillis();
 
-        // 2nd graph
-        // remove old data
-        iobGraph.getSeries().clear();
+                //  ------------------ 1st graph
+                Profiler.log(log, from + " - 1st graph - START", updateGUIStart);
 
-        GraphData secondGraphData = new GraphData();
+                final GraphData graphData = new GraphData(bgGraph);
+
+                // **** In range Area ****
+                graphData.addInRangeArea(fromTime, endTime, lowLine, highLine);
+
+                // **** BG ****
+                if (showPrediction)
+                    graphData.addBgReadings(fromTime, toTime, lowLine, highLine, (DetermineBasalResultAMA) finalLastRun.constraintsProcessed);
+                else
+                    graphData.addBgReadings(fromTime, toTime, lowLine, highLine, null);
+
+                // set manual x bounds to have nice steps
+                graphData.formatAxis(fromTime, endTime);
+
+                // Treatments
+                graphData.addTreatments(fromTime, endTime);
+
+                // add basal data
+                if (pump.getPumpDescription().isTempBasalCapable && showBasalsView.isChecked()) {
+                    graphData.addBasals(fromTime, now, lowLine / graphData.maxY / 1.2d);
+                }
+
+                // **** NOW line ****
+                graphData.addNowLine(now);
+
+                // ------------------ 2nd graph
+                Profiler.log(log, from + " - 2nd graph - START", updateGUIStart);
+
+                final GraphData secondGraphData = new GraphData(iobGraph);
 
                 boolean useIobForScale = false;
                 boolean useCobForScale = false;
@@ -1264,53 +1333,39 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 }
 
                 if (showIobView.isChecked())
-            secondGraphData.addIob(iobGraph, fromTime, now, useIobForScale, 1d);
+                    secondGraphData.addIob(fromTime, now, useIobForScale, 1d);
                 if (showCobView.isChecked())
-            secondGraphData.addCob(iobGraph, fromTime, now, useCobForScale, useCobForScale ? 1d : 0.5d);
+                    secondGraphData.addCob(fromTime, now, useCobForScale, useCobForScale ? 1d : 0.5d);
                 if (showDeviationsView.isChecked())
-            secondGraphData.addDeviations(iobGraph, fromTime, now, useDevForScale, 1d);
+                    secondGraphData.addDeviations(fromTime, now, useDevForScale, 1d);
                 if (showRatiosView.isChecked())
-            secondGraphData.addRatio(iobGraph, fromTime, now, useRatioForScale, 1d);
+                    secondGraphData.addRatio(fromTime, now, useRatioForScale, 1d);
 
+                // **** NOW line ****
+                // set manual x bounds to have nice steps
+                secondGraphData.formatAxis(fromTime, endTime);
+                secondGraphData.addNowLine(now);
+
+                // do GUI update
+                FragmentActivity activity = getActivity();
+                if (activity != null) {
+                    activity.runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
                             if (showIobView.isChecked() || showCobView.isChecked() || showDeviationsView.isChecked() || showRatiosView.isChecked()) {
                                 iobGraph.setVisibility(View.VISIBLE);
                             } else {
                                 iobGraph.setVisibility(View.GONE);
                             }
-
-        // remove old data from graph
-        bgGraph.getSeries().clear();
-
-        GraphData graphData = new GraphData();
-
-        // **** In range Area ****
-        graphData.addInRangeArea(bgGraph, fromTime, endTime, lowLine, highLine);
-
-        // **** BG ****
-        if (showPrediction)
-            graphData.addBgReadings(bgGraph, fromTime, toTime, lowLine, highLine, (DetermineBasalResultAMA) finalLastRun.constraintsProcessed);
-        else
-            graphData.addBgReadings(bgGraph, fromTime, toTime, lowLine, highLine, null);
-
-        // set manual x bounds to have nice steps
-        graphData.formatAxis(bgGraph, fromTime, endTime);
-        secondGraphData.formatAxis(iobGraph, fromTime, endTime);
-
-        // Treatments
-        graphData.addTreatments(bgGraph, fromTime, endTime);
-
-        // add basal data
-        if (pump.getPumpDescription().isTempBasalCapable && showBasalsView.isChecked()) {
-            graphData.addBasals(bgGraph, fromTime, now, lowLine / graphData.maxY / 1.2d);
+                            // finally enforce drawing of graphs
+                            graphData.performUpdate();
+                            secondGraphData.performUpdate();
+                            Profiler.log(log, from + " - onDataChanged", updateGUIStart);
                         }
-
-        // **** NOW line ****
-        graphData.addNowLine(bgGraph, now);
-        secondGraphData.addNowLine(iobGraph, now);
-
-        // finaly enforce drawing of graphs
-        bgGraph.onDataChanged(false, false);
-        iobGraph.onDataChanged(false, false);
+                    });
+                }
+            }
+        }).start();
 
         Profiler.log(log, from, updateGUIStart);
     }
@@ -1396,6 +1451,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 }
             }
         }
+
     }
 
     void updateNotifications() {

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

@@ -9,6 +9,7 @@ import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.data.QuickWizard;
 import info.nightscout.androidaps.events.EventRefreshOverview;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;

app/src/main/java/info/nightscout/androidaps/plugins/Overview/activities/QuickWizardListActivity.java

@@ -1,9 +1,9 @@
 package info.nightscout.androidaps.plugins.Overview.activities;
 
 import android.app.Activity;
+import android.os.Bundle;
 import android.support.v4.app.FragmentManager;
 import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
 import android.support.v7.widget.CardView;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -15,13 +15,11 @@ import android.widget.TextView;
 
 import com.squareup.otto.Subscribe;
 
-import java.text.SimpleDateFormat;
-
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.data.QuickWizard;
 import info.nightscout.androidaps.plugins.Overview.Dialogs.EditQuickWizardDialog;
 import info.nightscout.androidaps.plugins.Overview.OverviewPlugin;
-import info.nightscout.androidaps.plugins.Overview.QuickWizard;
 import info.nightscout.androidaps.plugins.Overview.events.EventQuickWizardChange;
 import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.DecimalFormatter;
@@ -153,6 +151,7 @@ public class QuickWizardListActivity extends AppCompatActivity implements View.O
                 break;
         }
     }
+
     @Subscribe
     public void onStatusEvent(final EventQuickWizardChange ev) {
         updateGUI();

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

@@ -27,7 +27,7 @@ import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.IobCobCalculator.AutosensData;
 import info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin;
-import info.nightscout.androidaps.plugins.IobCobCalculator.events.BasalData;
+import info.nightscout.androidaps.plugins.IobCobCalculator.BasalData;
 import info.nightscout.androidaps.plugins.OpenAPSAMA.DetermineBasalResultAMA;
 import info.nightscout.androidaps.plugins.Overview.graphExtensions.AreaGraphSeries;
 import info.nightscout.androidaps.plugins.Overview.graphExtensions.DataPointWithLabelInterface;
@@ -45,15 +45,18 @@ import info.nightscout.utils.Round;
 
 public class GraphData {
 
-    public GraphData() {
-        units = MainApp.getConfigBuilder().getProfileUnits();
-    }
-
+    private GraphView graph;
     public double maxY = 0;
     private List<BgReading> bgReadingsArray;
     private String units;
+    private List<Series> series = new ArrayList<>();
 
-    public void addBgReadings(GraphView bgGraph, long fromTime, long toTime, double lowLine, double highLine, DetermineBasalResultAMA amaResult) {
+    public GraphData(GraphView graph) {
+        units = MainApp.getConfigBuilder().getProfileUnits();
+        this.graph = graph;
+    }
+
+    public void addBgReadings(long fromTime, long toTime, double lowLine, double highLine, DetermineBasalResultAMA amaResult) {
         double maxBgValue = 0d;
         bgReadingsArray = MainApp.getDbHelper().getBgreadingsDataFromTime(fromTime, true);
         List<DataPointWithLabelInterface> bgListArray = new ArrayList<>();
@@ -81,20 +84,18 @@ public class GraphData {
         DataPointWithLabelInterface[] bg = new DataPointWithLabelInterface[bgListArray.size()];
         bg = bgListArray.toArray(bg);
 
-        if (bg.length > 0) {
-            addSeriesWithoutInvalidate(bgGraph, new PointsWithLabelGraphSeries<>(bg));
-        }
 
         maxY = maxBgValue;
         // set manual y bounds to have nice steps
-        bgGraph.getViewport().setMaxY(maxY);
-        bgGraph.getViewport().setMinY(0);
-        bgGraph.getViewport().setYAxisBoundsManual(true);
-        bgGraph.getGridLabelRenderer().setNumVerticalLabels(numOfVertLines);
+        graph.getViewport().setMaxY(maxY);
+        graph.getViewport().setMinY(0);
+        graph.getViewport().setYAxisBoundsManual(true);
+        graph.getGridLabelRenderer().setNumVerticalLabels(numOfVertLines);
 
+        addSeries(new PointsWithLabelGraphSeries<>(bg));
     }
 
-    public void addInRangeArea(GraphView bgGraph, long fromTime, long toTime, double lowLine, double highLine) {
+    public void addInRangeArea(long fromTime, long toTime, double lowLine, double highLine) {
         AreaGraphSeries<DoubleDataPoint> inRangeAreaSeries;
 
         DoubleDataPoint[] inRangeAreaDataPoints = new DoubleDataPoint[]{
@@ -102,14 +103,15 @@ public class GraphData {
                 new DoubleDataPoint(toTime, lowLine, highLine)
         };
         inRangeAreaSeries = new AreaGraphSeries<>(inRangeAreaDataPoints);
-        addSeriesWithoutInvalidate(bgGraph, inRangeAreaSeries);
         inRangeAreaSeries.setColor(0);
         inRangeAreaSeries.setDrawBackground(true);
         inRangeAreaSeries.setBackgroundColor(MainApp.sResources.getColor(R.color.inrangebackground));
+
+        addSeries(inRangeAreaSeries);
     }
 
     // scale in % of vertical size (like 0.3)
-    public void addBasals(GraphView bgGraph, long fromTime, long toTime, double scale) {
+    public void addBasals(long fromTime, long toTime, double scale) {
         LineGraphSeries<ScaledDataPoint> basalsLineSeries;
         LineGraphSeries<ScaledDataPoint> absoluteBasalsLineSeries;
         LineGraphSeries<ScaledDataPoint> baseBasalsSeries;
@@ -210,13 +212,13 @@ public class GraphData {
 
         basalScale.setMultiplier(maxY * scale / maxBasalValueFound);
 
-        addSeriesWithoutInvalidate(bgGraph, baseBasalsSeries);
-        addSeriesWithoutInvalidate(bgGraph, tempBasalsSeries);
-        addSeriesWithoutInvalidate(bgGraph, basalsLineSeries);
-        addSeriesWithoutInvalidate(bgGraph, absoluteBasalsLineSeries);
+        addSeries(baseBasalsSeries);
+        addSeries(tempBasalsSeries);
+        addSeries(basalsLineSeries);
+        addSeries(absoluteBasalsLineSeries);
     }
 
-    public void addTreatments(GraphView bgGraph, long fromTime, long endTime) {
+    public void addTreatments(long fromTime, long endTime) {
         List<DataPointWithLabelInterface> filteredTreatments = new ArrayList<>();
 
         List<Treatment> treatments = MainApp.getConfigBuilder().getTreatmentsFromHistory();
@@ -262,9 +264,7 @@ public class GraphData {
 
         DataPointWithLabelInterface[] treatmentsArray = new DataPointWithLabelInterface[filteredTreatments.size()];
         treatmentsArray = filteredTreatments.toArray(treatmentsArray);
-        if (treatmentsArray.length > 0) {
-            addSeriesWithoutInvalidate(bgGraph, new PointsWithLabelGraphSeries<>(treatmentsArray));
-        }
+        addSeries(new PointsWithLabelGraphSeries<>(treatmentsArray));
     }
 
     double getNearestBg(long date) {
@@ -279,7 +279,7 @@ public class GraphData {
     }
 
     // scale in % of vertical size (like 0.3)
-    public void addIob(GraphView graph, long fromTime, long toTime, boolean useForScale, double scale) {
+    public void addIob(long fromTime, long toTime, boolean useForScale, double scale) {
         FixedLineGraphSeries<ScaledDataPoint> iobSeries;
         List<ScaledDataPoint> iobArray = new ArrayList<>();
         Double maxIobValueFound = 0d;
@@ -310,11 +310,11 @@ public class GraphData {
 
         iobScale.setMultiplier(maxY * scale / maxIobValueFound);
 
-        addSeriesWithoutInvalidate(graph, iobSeries);
+        addSeries(iobSeries);
     }
 
     // scale in % of vertical size (like 0.3)
-    public void addCob(GraphView graph, long fromTime, long toTime, boolean useForScale, double scale) {
+    public void addCob(long fromTime, long toTime, boolean useForScale, double scale) {
         FixedLineGraphSeries<ScaledDataPoint> cobSeries;
         List<ScaledDataPoint> cobArray = new ArrayList<>();
         Double maxCobValueFound = 0d;
@@ -349,11 +349,11 @@ public class GraphData {
 
         cobScale.setMultiplier(maxY * scale / maxCobValueFound);
 
-        addSeriesWithoutInvalidate(graph, cobSeries);
+        addSeries(cobSeries);
     }
 
     // scale in % of vertical size (like 0.3)
-    public void addDeviations(GraphView graph, long fromTime, long toTime, boolean useForScale, double scale) {
+    public void addDeviations(long fromTime, long toTime, boolean useForScale, double scale) {
         class DeviationDataPoint extends ScaledDataPoint {
             public int color;
 
@@ -396,11 +396,11 @@ public class GraphData {
 
         devScale.setMultiplier(maxY * scale / maxDevValueFound);
 
-        addSeriesWithoutInvalidate(graph, devSeries);
+        addSeries(devSeries);
     }
 
     // scale in % of vertical size (like 0.3)
-    public void addRatio(GraphView graph, long fromTime, long toTime, boolean useForScale, double scale) {
+    public void addRatio(long fromTime, long toTime, boolean useForScale, double scale) {
         LineGraphSeries<DataPoint> ratioSeries;
         List<DataPoint> ratioArray = new ArrayList<>();
         Double maxRatioValueFound = 0d;
@@ -426,11 +426,11 @@ public class GraphData {
 
         ratioScale.setMultiplier(maxY * scale / maxRatioValueFound);
 
-        addSeriesWithoutInvalidate(graph, ratioSeries);
+        addSeries(ratioSeries);
     }
 
     // scale in % of vertical size (like 0.3)
-    public void addNowLine(GraphView graph, long now) {
+    public void addNowLine(long now) {
         LineGraphSeries<DataPoint> seriesNow;
         DataPoint[] nowPoints = new DataPoint[]{
                 new DataPoint(now, 0),
@@ -447,10 +447,10 @@ public class GraphData {
         paint.setColor(Color.WHITE);
         seriesNow.setCustomPaint(paint);
 
-        addSeriesWithoutInvalidate(graph, seriesNow);
+        addSeries(seriesNow);
     }
 
-    public void formatAxis(GraphView graph, long fromTime, long endTime) {
+    public void formatAxis(long fromTime, long endTime) {
         graph.getViewport().setMaxX(endTime);
         graph.getViewport().setMinX(fromTime);
         graph.getViewport().setXAxisBoundsManual(true);
@@ -458,11 +458,23 @@ public class GraphData {
         graph.getGridLabelRenderer().setNumHorizontalLabels(7); // only 7 because of the space
     }
 
-    private void addSeriesWithoutInvalidate(GraphView bgGraph, Series s) {
+    private void addSeries(Series s) {
+        series.add(s);
+    }
+
+    public void performUpdate() {
+        // clear old data
+        graph.getSeries().clear();
+        
+        // add precalculated series
+        for (Series s: series) {
             if (!s.isEmpty()) {
-            s.onGraphViewAttached(bgGraph);
-            bgGraph.getSeries().add(s);
+                s.onGraphViewAttached(graph);
+                graph.getSeries().add(s);
             }
         }
         
+        // draw it
+        graph.onDataChanged(false, false);
+    }
 }

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

@@ -56,6 +56,10 @@ public class Notification {
     public static final int PUMP_UNREACHABLE = 26;
     public static final int BG_READINGS_MISSED = 27;
     public static final int UNSUPPORTED_FIRMWARE = 28;
+    public static final int MINIMAL_BASAL_VALUE_REPLACED = 29;
+    public static final int BASAL_PROFILE_NOT_ALIGNED_TO_HOURS = 30;
+    public static final int ZERO_VALUE_IN_PROFILE = 31;
+    public static final int NO_LOCALE_PROFILE_FOUND = 32;
 
     public int id;
     public Date date;

app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfilePlugin.java

@@ -162,9 +162,6 @@ public class CircadianPercentageProfilePlugin implements PluginBase, ProfileInte
             baseic[i] = SP.getDouble(SETTINGS_PREFIX + "baseic" + i, baseic[i]);
             baseisf[i] = SP.getDouble(SETTINGS_PREFIX + "baseisf" + i, baseisf[i]);
         }
-
-
-        createConvertedProfile();
     }
 
     public String externallySetParameters(int timeshift, int percentage) {
@@ -182,9 +179,6 @@ public class CircadianPercentageProfilePlugin implements PluginBase, ProfileInte
         if (timeshift < 0 || timeshift > 23) {
             msg += String.format(MainApp.sResources.getString(R.string.openapsma_valueoutofrange), "Profile-Timeshift") + "\n";
         }
-        if (!SP.getBoolean("syncprofiletopump", false)) {
-            msg += MainApp.sResources.getString(R.string.syncprofiletopump_title) + " " + MainApp.sResources.getString(R.string.cpp_sync_setting_missing) + "\n";
-        }
         final Profile profile = MainApp.getConfigBuilder().getProfile();
 
         if (profile == null || profile.getBasal() == null) {
@@ -350,6 +344,9 @@ public class CircadianPercentageProfilePlugin implements PluginBase, ProfileInte
 
     @Override
     public ProfileStore getProfile() {
+        if (convertedProfile == null)
+            createConvertedProfile();
+
         performLimitCheck();
         return convertedProfile;
     }
@@ -361,6 +358,9 @@ public class CircadianPercentageProfilePlugin implements PluginBase, ProfileInte
 
     @Override
     public String getProfileName() {
+        if (convertedProfile == null)
+            createConvertedProfile();
+
         performLimitCheck();
         return convertedProfileName;
     }

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

@@ -23,6 +23,7 @@ import java.text.DecimalFormat;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.events.EventInitializationChanged;
+import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.plugins.Careportal.CareportalFragment;
 import info.nightscout.androidaps.plugins.Careportal.Dialogs.NewNSTreatmentDialog;
 import info.nightscout.androidaps.plugins.Careportal.OptionsToShow;
@@ -84,15 +85,17 @@ public class LocalProfileFragment extends SubscriberFragment {
                 }
             };
 
+            PumpDescription pumpDescription = ConfigBuilderPlugin.getActivePump().getPumpDescription();
+
             View layout = inflater.inflate(R.layout.localprofile_fragment, container, false);
             diaView = (NumberPicker) layout.findViewById(R.id.localprofile_dia);
             diaView.setParams(localProfilePlugin.dia, 2d, 48d, 0.1d, new DecimalFormat("0.0"), false, textWatch);
             mgdlView = (RadioButton) layout.findViewById(R.id.localprofile_mgdl);
             mmolView = (RadioButton) layout.findViewById(R.id.localprofile_mmol);
-            icView = new TimeListEdit(getContext(), layout, R.id.localprofile_ic, MainApp.sResources.getString(R.string.nsprofileview_ic_label) + ":", getPlugin().ic, null, 0.1d, new DecimalFormat("0.0"), save);
-            isfView = new TimeListEdit(getContext(), layout, R.id.localprofile_isf, MainApp.sResources.getString(R.string.nsprofileview_isf_label) + ":", getPlugin().isf, null, 0.1d, new DecimalFormat("0.0"), save);
-            basalView = new TimeListEdit(getContext(), layout, R.id.localprofile_basal, MainApp.sResources.getString(R.string.nsprofileview_basal_label) + ": " + getSumLabel(), getPlugin().basal, null, 0.01d, new DecimalFormat("0.00"), save);
-            targetView = new TimeListEdit(getContext(), layout, R.id.localprofile_target, MainApp.sResources.getString(R.string.nsprofileview_target_label) + ":", getPlugin().targetLow, getPlugin().targetHigh, 0.1d, new DecimalFormat("0.0"), save);
+            icView = new TimeListEdit(getContext(), layout, R.id.localprofile_ic, MainApp.sResources.getString(R.string.nsprofileview_ic_label) + ":", getPlugin().ic, null, 0.5, 50d, 0.1d, new DecimalFormat("0.0"), save);
+            isfView = new TimeListEdit(getContext(), layout, R.id.localprofile_isf, MainApp.sResources.getString(R.string.nsprofileview_isf_label) + ":", getPlugin().isf, null, 0.5, 500d, 0.1d, new DecimalFormat("0.0"), save);
+            basalView = new TimeListEdit(getContext(), layout, R.id.localprofile_basal, MainApp.sResources.getString(R.string.nsprofileview_basal_label) + ": " + getSumLabel(), getPlugin().basal, null, pumpDescription.basalMinimumRate, 10, 0.01d, new DecimalFormat("0.00"), save);
+            targetView = new TimeListEdit(getContext(), layout, R.id.localprofile_target, MainApp.sResources.getString(R.string.nsprofileview_target_label) + ":", getPlugin().targetLow, getPlugin().targetHigh, 3d, 200, 0.1d, new DecimalFormat("0.0"), save);
             profileswitchButton = (Button) layout.findViewById(R.id.localprofile_profileswitch);
 
             if (!ConfigBuilderPlugin.getActivePump().getPumpDescription().isTempBasalCapable) {

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

@@ -178,7 +178,6 @@ public class LocalProfilePlugin implements PluginBase, ProfileInterface {
             } catch (JSONException ignored) {
             }
         }
-        createConvertedProfile();
     }
 
     /*
@@ -244,6 +243,8 @@ public class LocalProfilePlugin implements PluginBase, ProfileInterface {
 
     @Override
     public ProfileStore getProfile() {
+        if (convertedProfile == null)
+            createConvertedProfile();
         return convertedProfile;
     }
 
@@ -254,6 +255,8 @@ public class LocalProfilePlugin implements PluginBase, ProfileInterface {
 
     @Override
     public String getProfileName() {
+        if (convertedProfile == null)
+            createConvertedProfile();
         return DecimalFormatter.to2Decimal(convertedProfile.getDefaultProfile().percentageBasalSum()) + "U ";
     }
 

app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfilePlugin.java

@@ -120,7 +120,6 @@ public class NSProfilePlugin implements PluginBase, ProfileInterface {
         profile = new ProfileStore(newProfile.getData());
         storeNSProfile();
         MainApp.bus().post(new EventNSProfileUpdateGUI());
-        if (SP.getBoolean("syncprofiletopump", false)) {
         ConfigBuilderPlugin.getCommandQueue().setProfile(MainApp.getConfigBuilder().getProfile(), new Callback() {
             @Override
             public void run() {
@@ -133,7 +132,6 @@ public class NSProfilePlugin implements PluginBase, ProfileInterface {
             }
         });
     }
-    }
 
     private static void storeNSProfile() {
         SP.putString("profile", profile.getData().toString());

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

@@ -13,9 +13,9 @@ import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.data.ProfileStore;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.interfaces.ProfileInterface;
-import info.nightscout.androidaps.data.ProfileStore;
 import info.nightscout.utils.SP;
 
 /**
@@ -146,7 +146,6 @@ public class SimpleProfilePlugin implements PluginBase, ProfileInterface {
         basal = SP.getDouble("SimpleProfile" + "basal", 1d);
         targetLow = SP.getDouble("SimpleProfile" + "targetlow", 80d);
         targetHigh = SP.getDouble("SimpleProfile" + "targethigh", 120d);
-        createConvertedProfile();
     }
 
     /*
@@ -211,6 +210,8 @@ public class SimpleProfilePlugin implements PluginBase, ProfileInterface {
 
     @Override
     public ProfileStore getProfile() {
+        if (convertedProfile == null)
+            createConvertedProfile();
         return convertedProfile;
     }
 

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

@@ -434,7 +434,7 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C
             // Convert duration from minutes to hours
             if (Config.logPumpActions)
                 log.debug("setTempBasalAbsolute: Setting temp basal " + percentRate + "% for " + durationInMinutes + " mins (doLowTemp || doHighTemp)");
-            return setTempBasalPercent(percentRate, durationInMinutes);
+            return setTempBasalPercent(percentRate, durationInMinutes, false);
         }
         if (doExtendedTemp) {
             // Check if some temp is already in progress
@@ -499,7 +499,7 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C
     }
 
     @Override
-    public PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes) {
+    public PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes, boolean enforceNew) {
         PumpEnactResult result = new PumpEnactResult();
         ConfigBuilderPlugin configBuilderPlugin = MainApp.getConfigBuilder();
         percent = configBuilderPlugin.applyBasalConstraints(percent);
@@ -514,7 +514,7 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C
         if (percent > getPumpDescription().maxTempPercent)
             percent = getPumpDescription().maxTempPercent;
         TemporaryBasal runningTB =  MainApp.getConfigBuilder().getRealTempBasalFromHistory(System.currentTimeMillis());
-        if (runningTB != null && runningTB.percentRate == percent) {
+        if (runningTB != null && runningTB.percentRate == percent && !enforceNew) {
             result.enacted = false;
             result.success = true;
             result.isTempCancel = false;
@@ -785,6 +785,11 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C
         return true;
     }
 
+    @Override
+    public boolean isSMBModeEnabled() {
+        return true;
+    }
+
     @SuppressWarnings("PointlessBooleanExpression")
     @Override
     public Double applyBasalConstraints(Double absoluteRate) {

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanPlugin.java

@@ -436,7 +436,7 @@ public class DanaRKoreanPlugin implements PluginBase, PumpInterface, DanaRInterf
             // Convert duration from minutes to hours
             if (Config.logPumpActions)
                 log.debug("setTempBasalAbsolute: Setting temp basal " + percentRate + "% for " + durationInMinutes + " mins (doLowTemp || doHighTemp)");
-            return setTempBasalPercent(percentRate, durationInMinutes);
+            return setTempBasalPercent(percentRate, durationInMinutes, false);
         }
         if (doExtendedTemp) {
             // Check if some temp is already in progress
@@ -501,7 +501,7 @@ public class DanaRKoreanPlugin implements PluginBase, PumpInterface, DanaRInterf
     }
 
     @Override
-    public PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes) {
+    public PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes, boolean enforceNew) {
         PumpEnactResult result = new PumpEnactResult();
         ConfigBuilderPlugin configBuilderPlugin = MainApp.getConfigBuilder();
         percent = configBuilderPlugin.applyBasalConstraints(percent);
@@ -516,7 +516,7 @@ public class DanaRKoreanPlugin implements PluginBase, PumpInterface, DanaRInterf
         if (percent > getPumpDescription().maxTempPercent)
             percent = getPumpDescription().maxTempPercent;
         TemporaryBasal runningTB =  MainApp.getConfigBuilder().getRealTempBasalFromHistory(System.currentTimeMillis());
-        if (runningTB != null && runningTB.percentRate == percent) {
+        if (runningTB != null && runningTB.percentRate == percent && enforceNew) {
             result.enacted = false;
             result.success = true;
             result.isTempCancel = false;
@@ -787,6 +787,11 @@ public class DanaRKoreanPlugin implements PluginBase, PumpInterface, DanaRInterf
         return true;
     }
 
+    @Override
+    public boolean isSMBModeEnabled() {
+        return true;
+    }
+
     @SuppressWarnings("PointlessBooleanExpression")
     @Override
     public Double applyBasalConstraints(Double absoluteRate) {

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

@@ -289,6 +289,11 @@ public class DanaRSPlugin implements PluginBase, PumpInterface, DanaRInterface,
         return true;
     }
 
+    @Override
+    public boolean isSMBModeEnabled() {
+        return true;
+    }
+
     @Override
     public Double applyBasalConstraints(Double absoluteRate) {
         double origAbsoluteRate = absoluteRate;
@@ -400,6 +405,8 @@ public class DanaRSPlugin implements PluginBase, PumpInterface, DanaRInterface,
         } else {
             MainApp.bus().post(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED));
             MainApp.bus().post(new EventDismissNotification(Notification.FAILED_UDPATE_PROFILE));
+            Notification notification = new Notification(Notification.PROFILE_SET_OK, MainApp.sResources.getString(R.string.profile_set_ok), Notification.INFO, 60);
+            MainApp.bus().post(new EventNewNotification(notification));
             result.success = true;
             result.enacted = true;
             result.comment = "OK";
@@ -580,7 +587,7 @@ public class DanaRSPlugin implements PluginBase, PumpInterface, DanaRInterface,
     }
 
     @Override
-    public synchronized PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes) {
+    public synchronized PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes, boolean enforceNew) {
         PumpEnactResult result = new PumpEnactResult();
         ConfigBuilderPlugin configBuilderPlugin = MainApp.getConfigBuilder();
         percent = configBuilderPlugin.applyBasalConstraints(percent);
@@ -595,7 +602,7 @@ public class DanaRSPlugin implements PluginBase, PumpInterface, DanaRInterface,
         if (percent > getPumpDescription().maxTempPercent)
             percent = getPumpDescription().maxTempPercent;
         TemporaryBasal runningTB = MainApp.getConfigBuilder().getTempBasalFromHistory(System.currentTimeMillis());
-        if (runningTB != null && runningTB.percentRate == percent) {
+        if (runningTB != null && runningTB.percentRate == percent && !enforceNew) {
             result.enacted = false;
             result.success = true;
             result.isTempCancel = false;

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

@@ -7,8 +7,10 @@ import android.bluetooth.le.BluetoothLeScanner;
 import android.bluetooth.le.ScanCallback;
 import android.bluetooth.le.ScanResult;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.Handler;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.view.ViewGroup;
@@ -31,7 +33,6 @@ import info.nightscout.utils.SP;
 public class BLEScanActivity extends AppCompatActivity {
     private static Logger log = LoggerFactory.getLogger(BLEScanActivity.class);
 
-    private Context mContext = null;
 
     private ListView listView = null;
     private ListAdapter mListAdapter = null;
@@ -53,26 +54,20 @@ public class BLEScanActivity extends AppCompatActivity {
         listView.setEmptyView(findViewById(R.id.danars_blescanner_nodevice));
         listView.setAdapter(mListAdapter);
 
-        initView();
-    }
-
-    private void initView() {
-        mContext = getApplicationContext();
-
-        BluetoothManager bluetoothManager = (BluetoothManager) mContext.getSystemService(Context.BLUETOOTH_SERVICE);
-        mBluetoothAdapter = bluetoothManager.getAdapter();
-        mBluetoothLeScanner = mBluetoothAdapter.getBluetoothLeScanner();
-
-        // MIKE: test mBluetoothLeScanner for null (bt disabled)
-
         mListAdapter.notifyDataSetChanged();
-
     }
 
     @Override
     protected void onResume() {
         super.onResume();
 
+        mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+        mBluetoothLeScanner = mBluetoothAdapter.getBluetoothLeScanner();
+
+        if (mBluetoothLeScanner == null) {
+            mBluetoothAdapter.enable();
+            mBluetoothLeScanner = mBluetoothAdapter.getBluetoothLeScanner();
+        }
         startScan();
     }
 
@@ -138,7 +133,7 @@ public class BLEScanActivity extends AppCompatActivity {
             ViewHolder holder;
 
             if (v == null) {
-                v = View.inflate(mContext, R.layout.danars_blescanner_item, null);
+                v = View.inflate(getApplicationContext(), R.layout.danars_blescanner_item, null);
                 holder = new ViewHolder(v);
                 v.setTag(holder);
             } else {
@@ -167,6 +162,7 @@ public class BLEScanActivity extends AppCompatActivity {
             public void onClick(View v) {
                 SP.putString(R.string.key_danars_address, item.device.getAddress());
                 SP.putString(R.string.key_danars_name, mName.getText().toString());
+                item.device.createBond();
                 MainApp.bus().post(new EventDanaRSDeviceChange());
                 finish();
             }

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

@@ -118,7 +118,7 @@ public class PairingProgressDialog extends DialogFragment implements View.OnClic
 
     @Override
     public void dismiss() {
-        super.dismiss();
+        super.dismissAllowingStateLoss();
         if (helperActivity != null) {
             helperActivity.finish();
         }

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/events/EventDanaRSDeviceChange.java

@@ -1,8 +1,10 @@
 package info.nightscout.androidaps.plugins.PumpDanaRS.events;
 
+import info.nightscout.androidaps.events.Event;
+
 /**
  * Created by mike on 05.09.2017.
  */
 
-public class EventDanaRSDeviceChange {
+public class EventDanaRSDeviceChange extends Event {
 }

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/events/EventDanaRSPacket.java

@@ -1,12 +1,13 @@
 package info.nightscout.androidaps.plugins.PumpDanaRS.events;
 
+import info.nightscout.androidaps.events.Event;
 import info.nightscout.androidaps.plugins.PumpDanaRS.comm.DanaRS_Packet;
 
 /**
  * Created by mike on 01.09.2017.
  */
 
-public class EventDanaRSPacket {
+public class EventDanaRSPacket extends Event{
     public EventDanaRSPacket(DanaRS_Packet data) {
         this.data = data;
     }

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/events/EventDanaRSPairingSuccess.java

@@ -1,8 +1,10 @@
 package info.nightscout.androidaps.plugins.PumpDanaRS.events;
 
+import info.nightscout.androidaps.events.Event;
+
 /**
  * Created by mike on 01.09.2017.
  */
 
-public class EventDanaRSPairingSuccess {
+public class EventDanaRSPairingSuccess extends Event{
 }

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

@@ -185,7 +185,10 @@ public class DanaRSService extends Service {
         while (!msg.done && bleComm.isConnected()) {
             SystemClock.sleep(100);
         }
+        if (DanaRS_Packet_APS_History_Events.lastEventTimeLoaded != 0)
             lastHistoryFetched = DanaRS_Packet_APS_History_Events.lastEventTimeLoaded - 45 * 60 * 1000L; // always load last 45 min
+        else
+            lastHistoryFetched = 0;
         log.debug("Events loaded");
         return new PumpEnactResult().success(true);
     }

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java

@@ -257,6 +257,8 @@ public class DanaRv2Plugin implements PluginBase, PumpInterface, DanaRInterface,
         } else {
             MainApp.bus().post(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED));
             MainApp.bus().post(new EventDismissNotification(Notification.FAILED_UDPATE_PROFILE));
+            Notification notification = new Notification(Notification.PROFILE_SET_OK, MainApp.sResources.getString(R.string.profile_set_ok), Notification.INFO, 60);
+            MainApp.bus().post(new EventNewNotification(notification));
             result.success = true;
             result.enacted = true;
             result.comment = "OK";
@@ -437,7 +439,7 @@ public class DanaRv2Plugin implements PluginBase, PumpInterface, DanaRInterface,
     }
 
     @Override
-    public PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes) {
+    public PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes, boolean enforceNew) {
         PumpEnactResult result = new PumpEnactResult();
         ConfigBuilderPlugin configBuilderPlugin = MainApp.getConfigBuilder();
         percent = configBuilderPlugin.applyBasalConstraints(percent);
@@ -452,7 +454,7 @@ public class DanaRv2Plugin implements PluginBase, PumpInterface, DanaRInterface,
         if (percent > getPumpDescription().maxTempPercent)
             percent = getPumpDescription().maxTempPercent;
         TemporaryBasal runningTB =  MainApp.getConfigBuilder().getRealTempBasalFromHistory(System.currentTimeMillis());
-        if (runningTB != null && runningTB.percentRate == percent) {
+        if (runningTB != null && runningTB.percentRate == percent && !enforceNew) {
             result.enacted = false;
             result.success = true;
             result.isTempCancel = false;
@@ -730,6 +732,11 @@ public class DanaRv2Plugin implements PluginBase, PumpInterface, DanaRInterface,
         return true;
     }
 
+   @Override
+    public boolean isSMBModeEnabled() {
+        return true;
+    }
+
     @SuppressWarnings("PointlessBooleanExpression")
     @Override
     public Double applyBasalConstraints(Double absoluteRate) {

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

@@ -527,7 +527,10 @@ public class DanaRv2ExecutionService extends Service {
             waitMsec(100);
         }
         waitMsec(200);
+        if (MsgHistoryEvents_v2.lastEventTimeLoaded != 0)
             lastHistoryFetched = MsgHistoryEvents_v2.lastEventTimeLoaded - 45 * 60 * 1000L; //always load last 45 min;
+        else
+            lastHistoryFetched = 0;
         return new PumpEnactResult().success(true);
     }
 

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

@@ -204,7 +204,7 @@ public class MDIPlugin implements PluginBase, PumpInterface {
     }
 
     @Override
-    public PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes) {
+    public PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes, boolean enforceNew) {
         PumpEnactResult result = new PumpEnactResult();
         result.success = false;
         result.comment = MainApp.instance().getString(R.string.pumperror);

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

@@ -1,8 +1,6 @@
 package info.nightscout.androidaps.plugins.PumpVirtual;
 
-import android.content.SharedPreferences;
 import android.os.SystemClock;
-import android.preference.PreferenceManager;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -16,6 +14,7 @@ import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
+import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.ExtendedBolus;
 import info.nightscout.androidaps.db.Source;
@@ -24,8 +23,9 @@ import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.interfaces.TreatmentsInterface;
-import info.nightscout.androidaps.data.Profile;
+import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventOverviewBolusProgress;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.PumpVirtual.events.EventVirtualPumpUpdateGui;
 import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.NSUpload;
@@ -65,6 +65,7 @@ public class VirtualPumpPlugin implements PluginBase, PumpInterface {
     }
 
     private static VirtualPumpPlugin plugin = null;
+
     public static VirtualPumpPlugin getPlugin() {
         loadFakingStatus();
         if (plugin == null)
@@ -219,12 +220,14 @@ public class VirtualPumpPlugin implements PluginBase, PumpInterface {
         // Do nothing here. we are using MainApp.getConfigBuilder().getActiveProfile().getProfile();
         PumpEnactResult result = new PumpEnactResult();
         result.success = true;
+        Notification notification = new Notification(Notification.PROFILE_SET_OK, MainApp.sResources.getString(R.string.profile_set_ok), Notification.INFO, 60);
+        MainApp.bus().post(new EventNewNotification(notification));
         return result;
     }
 
     @Override
     public boolean isThisProfileSet(Profile profile) {
-        return false;
+        return true;
     }
 
     @Override
@@ -304,7 +307,7 @@ public class VirtualPumpPlugin implements PluginBase, PumpInterface {
     }
 
     @Override
-    public PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes) {
+    public PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes, boolean enforceNew) {
         TreatmentsInterface treatmentsInterface = MainApp.getConfigBuilder();
         PumpEnactResult result = new PumpEnactResult();
         if (MainApp.getConfigBuilder().isTempBasalInProgress()) {
@@ -401,8 +404,7 @@ public class VirtualPumpPlugin implements PluginBase, PumpInterface {
 
     @Override
     public JSONObject getJSONStatus() {
-        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(MainApp.instance().getApplicationContext());
-        if (!preferences.getBoolean("virtualpump_uploadstatus", false)) {
+        if (!SP.getBoolean("virtualpump_uploadstatus", false)) {
             return null;
         }
         JSONObject pump = new JSONObject();

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

@@ -0,0 +1,173 @@
+package info.nightscout.androidaps.plugins.SourceDexcomG5;
+
+import android.app.Activity;
+import android.content.DialogInterface;
+import android.graphics.Paint;
+import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.crashlytics.android.Crashlytics;
+import com.squareup.otto.Subscribe;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.data.Profile;
+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.UploadQueue;
+import info.nightscout.utils.DateUtil;
+import info.nightscout.utils.NSUpload;
+
+/**
+ * Created by mike on 16.10.2017.
+ */
+
+public class BGSourceFragment extends SubscriberFragment {
+    private static Logger log = LoggerFactory.getLogger(BGSourceFragment.class);
+
+    RecyclerView recyclerView;
+
+    Profile profile;
+
+    final long MILLS_TO_THE_PAST = 12 * 60 * 60 * 1000L;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        try {
+            View view = inflater.inflate(R.layout.bgsource_fragment, container, false);
+
+            recyclerView = (RecyclerView) view.findViewById(R.id.bgsource_recyclerview);
+            recyclerView.setHasFixedSize(true);
+            LinearLayoutManager llm = new LinearLayoutManager(view.getContext());
+            recyclerView.setLayoutManager(llm);
+
+            long now = System.currentTimeMillis();
+            RecyclerViewAdapter adapter = new RecyclerViewAdapter(MainApp.getDbHelper().getAllBgreadingsDataFromTime(now - MILLS_TO_THE_PAST, false));
+            recyclerView.setAdapter(adapter);
+
+            profile = ConfigBuilderPlugin.getActiveProfileInterface().getProfile().getDefaultProfile();
+
+            return view;
+        } catch (Exception e) {
+            Crashlytics.logException(e);
+        }
+
+        return null;
+    }
+
+    @Subscribe
+    @SuppressWarnings("unused")
+    public void onStatusEvent(final EventNewBG ev) {
+        updateGUI();
+    }
+
+    @Override
+    protected void updateGUI() {
+        Activity activity = getActivity();
+        if (activity != null)
+            activity.runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    long now = System.currentTimeMillis();
+                    recyclerView.swapAdapter(new BGSourceFragment.RecyclerViewAdapter(MainApp.getDbHelper().getAllBgreadingsDataFromTime(now - MILLS_TO_THE_PAST, false)), true);
+                }
+            });
+    }
+
+    public class RecyclerViewAdapter extends RecyclerView.Adapter<RecyclerViewAdapter.BgReadingsViewHolder> {
+
+        List<BgReading> bgReadings;
+
+        RecyclerViewAdapter(List<BgReading> bgReadings) {
+            this.bgReadings = bgReadings;
+        }
+
+        @Override
+        public BgReadingsViewHolder onCreateViewHolder(ViewGroup viewGroup, int viewType) {
+            View v = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.bgsource_item, viewGroup, false);
+            return new BgReadingsViewHolder(v);
+        }
+
+        @Override
+        public void onBindViewHolder(BgReadingsViewHolder holder, int position) {
+            BgReading bgReading = bgReadings.get(position);
+            holder.ns.setVisibility(NSUpload.isIdValid(bgReading._id) ? View.VISIBLE : View.GONE);
+            holder.invalid.setVisibility(!bgReading.isValid ? View.VISIBLE : View.GONE);
+            holder.date.setText(DateUtil.dateAndTimeString(bgReading.date));
+            holder.value.setText(bgReading.valueToUnitsToString(profile.getUnits()));
+            holder.direction.setText(bgReading.directionToSymbol());
+            holder.remove.setTag(bgReading);
+        }
+
+        @Override
+        public int getItemCount() {
+            return bgReadings.size();
+        }
+
+        class BgReadingsViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
+            TextView date;
+            TextView value;
+            TextView direction;
+            TextView invalid;
+            TextView ns;
+            TextView remove;
+
+            BgReadingsViewHolder(View itemView) {
+                super(itemView);
+                date = (TextView) itemView.findViewById(R.id.bgsource_date);
+                value = (TextView) itemView.findViewById(R.id.bgsource_value);
+                direction = (TextView) itemView.findViewById(R.id.bgsource_direction);
+                invalid = (TextView) itemView.findViewById(R.id.invalid_sign);
+                ns = (TextView) itemView.findViewById(R.id.ns_sign);
+                remove = (TextView) itemView.findViewById(R.id.bgsource_remove);
+                remove.setOnClickListener(this);
+                remove.setPaintFlags(remove.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
+            }
+
+            @Override
+            public void onClick(View v) {
+                final BgReading bgReading = (BgReading) v.getTag();
+                switch (v.getId()) {
+
+                    case R.id.bgsource_remove:
+                        AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+                        builder.setTitle(MainApp.sResources.getString(R.string.confirmation));
+                        builder.setMessage(MainApp.sResources.getString(R.string.removerecord) + "\n" + DateUtil.dateAndTimeString(bgReading.date) + "\n" + bgReading.valueToUnitsToString(profile.getUnits()));
+                        builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int id) {
+/*                                final String _id = bgReading._id;
+                                if (NSUpload.isIdValid(_id)) {
+                                    NSUpload.removeFoodFromNS(_id);
+                                } else {
+                                    UploadQueue.removeID("dbAdd", _id);
+                                }
+*/
+                                bgReading.isValid = false;
+                                MainApp.getDbHelper().update(bgReading);
+                                updateGUI();
+                            }
+                        });
+                        builder.setNegativeButton(MainApp.sResources.getString(R.string.cancel), null);
+                        builder.show();
+                        break;
+
+                }
+            }
+        }
+    }
+
+}

app/src/main/java/info/nightscout/androidaps/plugins/SourceDexcomG5/SourceDexcomG5Plugin.java

@@ -12,6 +12,7 @@ import info.nightscout.androidaps.interfaces.PluginBase;
 
 public class SourceDexcomG5Plugin implements PluginBase, BgSourceInterface {
     private boolean fragmentEnabled = false;
+    private boolean fragmentVisible = false;
 
     private static SourceDexcomG5Plugin plugin = null;
 
@@ -23,7 +24,7 @@ public class SourceDexcomG5Plugin implements PluginBase, BgSourceInterface {
 
     @Override
     public String getFragmentClass() {
-        return null;
+        return BGSourceFragment.class.getName();
     }
 
     @Override
@@ -49,7 +50,7 @@ public class SourceDexcomG5Plugin implements PluginBase, BgSourceInterface {
 
     @Override
     public boolean isVisibleInTabs(int type) {
-        return false;
+        return Config.G5UPLOADER || type == BGSOURCE && fragmentVisible;
     }
 
     @Override
@@ -59,7 +60,7 @@ public class SourceDexcomG5Plugin implements PluginBase, BgSourceInterface {
 
     @Override
     public boolean hasFragment() {
-        return false;
+        return true;
     }
 
     @Override
@@ -74,7 +75,7 @@ public class SourceDexcomG5Plugin implements PluginBase, BgSourceInterface {
 
     @Override
     public void setFragmentVisible(int type, boolean fragmentVisible) {
-
+        if (type == BGSOURCE) this.fragmentVisible = fragmentVisible;
     }
 
     @Override

app/src/main/java/info/nightscout/androidaps/plugins/SourceGlimp/SourceGlimpPlugin.java

@@ -4,12 +4,14 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.interfaces.BgSourceInterface;
 import info.nightscout.androidaps.interfaces.PluginBase;
+import info.nightscout.androidaps.plugins.SourceDexcomG5.BGSourceFragment;
 
 /**
  * Created by mike on 05.08.2016.
  */
 public class SourceGlimpPlugin implements PluginBase, BgSourceInterface {
     private boolean fragmentEnabled = false;
+    private boolean fragmentVisible = false;
 
     private static SourceGlimpPlugin plugin = null;
 
@@ -21,7 +23,7 @@ public class SourceGlimpPlugin implements PluginBase, BgSourceInterface {
 
     @Override
     public String getFragmentClass() {
-        return null;
+        return BGSourceFragment.class.getName();
     }
 
     @Override
@@ -47,7 +49,7 @@ public class SourceGlimpPlugin implements PluginBase, BgSourceInterface {
 
     @Override
     public boolean isVisibleInTabs(int type) {
-        return false;
+        return type == BGSOURCE && fragmentVisible;
     }
 
     @Override
@@ -57,7 +59,7 @@ public class SourceGlimpPlugin implements PluginBase, BgSourceInterface {
 
     @Override
     public boolean hasFragment() {
-        return false;
+        return true;
     }
 
     @Override
@@ -72,7 +74,7 @@ public class SourceGlimpPlugin implements PluginBase, BgSourceInterface {
 
     @Override
     public void setFragmentVisible(int type, boolean fragmentVisible) {
-
+        if (type == BGSOURCE) this.fragmentVisible = fragmentVisible;
     }
 
     @Override

app/src/main/java/info/nightscout/androidaps/plugins/SourceMM640g/SourceMM640gPlugin.java

@@ -4,12 +4,14 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.interfaces.BgSourceInterface;
 import info.nightscout.androidaps.interfaces.PluginBase;
+import info.nightscout.androidaps.plugins.SourceDexcomG5.BGSourceFragment;
 
 /**
  * Created by mike on 05.08.2016.
  */
 public class SourceMM640gPlugin implements PluginBase, BgSourceInterface {
     private boolean fragmentEnabled = false;
+    private boolean fragmentVisible = false;
 
     private static SourceMM640gPlugin plugin = null;
 
@@ -21,7 +23,7 @@ public class SourceMM640gPlugin implements PluginBase, BgSourceInterface {
 
     @Override
     public String getFragmentClass() {
-        return null;
+        return BGSourceFragment.class.getName();
     }
 
     @Override
@@ -47,7 +49,7 @@ public class SourceMM640gPlugin implements PluginBase, BgSourceInterface {
 
     @Override
     public boolean isVisibleInTabs(int type) {
-        return false;
+        return type == BGSOURCE && fragmentVisible;
     }
 
     @Override
@@ -57,7 +59,7 @@ public class SourceMM640gPlugin implements PluginBase, BgSourceInterface {
 
     @Override
     public boolean hasFragment() {
-        return false;
+        return true;
     }
 
     @Override
@@ -72,7 +74,7 @@ public class SourceMM640gPlugin implements PluginBase, BgSourceInterface {
 
     @Override
     public void setFragmentVisible(int type, boolean fragmentVisible) {
-
+        if (type == BGSOURCE) this.fragmentVisible = fragmentVisible;
     }
 
     @Override

app/src/main/java/info/nightscout/androidaps/plugins/SourceNSClient/SourceNSClientPlugin.java

@@ -5,12 +5,14 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.interfaces.BgSourceInterface;
 import info.nightscout.androidaps.interfaces.PluginBase;
+import info.nightscout.androidaps.plugins.SourceDexcomG5.BGSourceFragment;
 
 /**
  * Created by mike on 05.08.2016.
  */
 public class SourceNSClientPlugin implements PluginBase, BgSourceInterface {
     private boolean fragmentEnabled = true;
+    private boolean fragmentVisible = false;
 
     private static SourceNSClientPlugin plugin = null;
 
@@ -22,7 +24,7 @@ public class SourceNSClientPlugin implements PluginBase, BgSourceInterface {
 
     @Override
     public String getFragmentClass() {
-        return null;
+        return BGSourceFragment.class.getName();
     }
 
     @Override
@@ -32,7 +34,7 @@ public class SourceNSClientPlugin implements PluginBase, BgSourceInterface {
 
     @Override
     public String getName() {
-        return MainApp.instance().getString(R.string.nsclient);
+        return MainApp.instance().getString(R.string.nsclientbg);
     }
 
     @Override
@@ -49,7 +51,7 @@ public class SourceNSClientPlugin implements PluginBase, BgSourceInterface {
 
     @Override
     public boolean isVisibleInTabs(int type) {
-        return false;
+        return type == BGSOURCE && fragmentVisible;
     }
 
     @Override
@@ -59,7 +61,7 @@ public class SourceNSClientPlugin implements PluginBase, BgSourceInterface {
 
     @Override
     public boolean hasFragment() {
-        return false;
+        return true;
     }
 
     @Override
@@ -74,7 +76,7 @@ public class SourceNSClientPlugin implements PluginBase, BgSourceInterface {
 
     @Override
     public void setFragmentVisible(int type, boolean fragmentVisible) {
-
+        if (type == BGSOURCE) this.fragmentVisible = fragmentVisible;
     }
 
     @Override

app/src/main/java/info/nightscout/androidaps/plugins/SourceXdrip/SourceXdripPlugin.java

@@ -4,12 +4,16 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.interfaces.BgSourceInterface;
 import info.nightscout.androidaps.interfaces.PluginBase;
+import info.nightscout.androidaps.plugins.SourceDexcomG5.BGSourceFragment;
 
 /**
  * Created by mike on 05.08.2016.
  */
 public class SourceXdripPlugin implements PluginBase, BgSourceInterface {
 
+    private boolean fragmentEnabled = false;
+    private boolean fragmentVisible = false;
+
     private static SourceXdripPlugin plugin = null;
 
     public static SourceXdripPlugin getPlugin() {
@@ -20,11 +24,9 @@ public class SourceXdripPlugin implements PluginBase, BgSourceInterface {
 
     @Override
     public String getFragmentClass() {
-        return null;
+        return BGSourceFragment.class.getName();
     }
 
-    private boolean fragmentEnabled = false;
-
     @Override
     public int getType() {
         return PluginBase.BGSOURCE;
@@ -48,7 +50,7 @@ public class SourceXdripPlugin implements PluginBase, BgSourceInterface {
 
     @Override
     public boolean isVisibleInTabs(int type) {
-        return false;
+        return type == BGSOURCE && fragmentVisible;
     }
 
     @Override
@@ -58,7 +60,7 @@ public class SourceXdripPlugin implements PluginBase, BgSourceInterface {
 
     @Override
     public boolean hasFragment() {
-        return false;
+        return true;
     }
 
     @Override
@@ -73,6 +75,7 @@ public class SourceXdripPlugin implements PluginBase, BgSourceInterface {
 
     @Override
     public void setFragmentVisible(int type, boolean fragmentVisible) {
+        if (type == BGSOURCE) this.fragmentVisible = fragmentVisible;
     }
 
     @Override

app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsBolusFragment.java

@@ -36,6 +36,7 @@ import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.events.EventNewBG;
 import info.nightscout.androidaps.events.EventTreatmentChange;
 import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
+import info.nightscout.androidaps.plugins.NSClientInternal.UploadQueue;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
 import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.DecimalFormatter;
@@ -82,7 +83,7 @@ public class TreatmentsBolusFragment extends SubscriberFragment implements View.
             holder.activity.setText(DecimalFormatter.to3Decimal(iob.activityContrib) + " U");
             holder.mealOrCorrection.setText(t.mealBolus ? MainApp.sResources.getString(R.string.mealbolus) : MainApp.sResources.getString(R.string.correctionbous));
             holder.ph.setVisibility(t.source == Source.PUMP ? View.VISIBLE : View.GONE);
-            holder.ns.setVisibility(t._id != null ? View.VISIBLE : View.GONE);
+            holder.ns.setVisibility(NSUpload.isIdValid(t._id) ? View.VISIBLE : View.GONE);
             holder.invalid.setVisibility(t.isValid ? View.GONE : View.VISIBLE);
             if (iob.iobContrib != 0)
                 holder.iob.setTextColor(ContextCompat.getColor(MainApp.instance(), R.color.colorActive));
@@ -146,8 +147,10 @@ public class TreatmentsBolusFragment extends SubscriberFragment implements View.
                                     treatment.isValid = false;
                                     MainApp.getDbHelper().update(treatment);
                                 } else {
-                                    if (_id != null && !_id.equals("")) {
+                                    if (NSUpload.isIdValid(_id)) {
                                         NSUpload.removeCareportalEntryFromNS(_id);
+                                    } else {
+                                        UploadQueue.removeID("dbAdd", _id);
                                     }
                                     MainApp.getDbHelper().delete(treatment);
                                 }

app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsExtendedBolusesFragment.java

@@ -31,6 +31,7 @@ import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.events.EventExtendedBolusChange;
 import info.nightscout.androidaps.events.EventNewBG;
 import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
+import info.nightscout.androidaps.plugins.NSClientInternal.UploadQueue;
 import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.DecimalFormatter;
 import info.nightscout.utils.NSUpload;
@@ -63,7 +64,7 @@ public class TreatmentsExtendedBolusesFragment extends SubscriberFragment {
         public void onBindViewHolder(ExtendedBolusesViewHolder holder, int position) {
             ExtendedBolus extendedBolus = extendedBolusList.getReversed(position);
             holder.ph.setVisibility(extendedBolus.source == Source.PUMP ? View.VISIBLE : View.GONE);
-            holder.ns.setVisibility(extendedBolus._id != null ? View.VISIBLE : View.GONE);
+            holder.ns.setVisibility(NSUpload.isIdValid(extendedBolus._id) ? View.VISIBLE : View.GONE);
             if (extendedBolus.isEndingEvent()) {
                 holder.date.setText(DateUtil.dateAndTimeString(extendedBolus.date));
                 holder.duration.setText(MainApp.sResources.getString(R.string.cancel));
@@ -148,8 +149,10 @@ public class TreatmentsExtendedBolusesFragment extends SubscriberFragment {
                         builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), new DialogInterface.OnClickListener() {
                             public void onClick(DialogInterface dialog, int id) {
                                 final String _id = extendedBolus._id;
-                                if (_id != null && !_id.equals("")) {
+                                if (NSUpload.isIdValid(_id)) {
                                     NSUpload.removeCareportalEntryFromNS(_id);
+                                } else {
+                                    UploadQueue.removeID("dbAdd", _id);
                                 }
                                 MainApp.getDbHelper().delete(extendedBolus);
                                 Answers.getInstance().logCustom(new CustomEvent("RemoveExtendedBolus"));

app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsProfileSwitchFragment.java

@@ -29,6 +29,7 @@ import info.nightscout.androidaps.db.ProfileSwitch;
 import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.events.EventProfileSwitchChange;
 import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
+import info.nightscout.androidaps.plugins.NSClientInternal.UploadQueue;
 import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.DecimalFormatter;
 import info.nightscout.utils.NSUpload;
@@ -66,7 +67,7 @@ public class TreatmentsProfileSwitchFragment extends SubscriberFragment implemen
             if (profile == null) return;
             ProfileSwitch profileSwitch = profileSwitchList.getReversed(position);
             holder.ph.setVisibility(profileSwitch.source == Source.PUMP ? View.VISIBLE : View.GONE);
-            holder.ns.setVisibility(profileSwitch._id != null ? View.VISIBLE : View.GONE);
+            holder.ns.setVisibility(NSUpload.isIdValid(profileSwitch._id) ? View.VISIBLE : View.GONE);
 
             holder.date.setText(DateUtil.dateAndTimeString(profileSwitch.date));
             if (!profileSwitch.isEndingEvent()) {
@@ -131,8 +132,10 @@ public class TreatmentsProfileSwitchFragment extends SubscriberFragment implemen
                         builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), new DialogInterface.OnClickListener() {
                             public void onClick(DialogInterface dialog, int id) {
                                 final String _id = profileSwitch._id;
-                                if (_id != null && !_id.equals("")) {
+                                if (NSUpload.isIdValid(_id)) {
                                     NSUpload.removeCareportalEntryFromNS(_id);
+                                } else {
+                                    UploadQueue.removeID("dbAdd", _id);
                                 }
                                 MainApp.getDbHelper().delete(profileSwitch);
                             }

app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTempTargetFragment.java

@@ -27,6 +27,7 @@ import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.db.TempTarget;
 import info.nightscout.androidaps.events.EventTempTargetChange;
 import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
+import info.nightscout.androidaps.plugins.NSClientInternal.UploadQueue;
 import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.DecimalFormatter;
 import info.nightscout.utils.NSUpload;
@@ -67,7 +68,7 @@ public class TreatmentsTempTargetFragment extends SubscriberFragment implements
             String units = MainApp.getConfigBuilder().getProfileUnits();
             TempTarget tempTarget = tempTargetList.getReversed(position);
             holder.ph.setVisibility(tempTarget.source == Source.PUMP ? View.VISIBLE : View.GONE);
-            holder.ns.setVisibility(tempTarget._id != null ? View.VISIBLE : View.GONE);
+            holder.ns.setVisibility(NSUpload.isIdValid(tempTarget._id) ? View.VISIBLE : View.GONE);
             if (!tempTarget.isEndingEvent()) {
                 holder.date.setText(DateUtil.dateAndTimeString(tempTarget.date) + " - " + DateUtil.timeString(tempTarget.originalEnd()));
                 holder.duration.setText(DecimalFormatter.to0Decimal(tempTarget.durationInMinutes) + " min");
@@ -149,8 +150,10 @@ public class TreatmentsTempTargetFragment extends SubscriberFragment implements
                         builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), new DialogInterface.OnClickListener() {
                             public void onClick(DialogInterface dialog, int id) {
                                 final String _id = tempTarget._id;
-                                if (_id != null && !_id.equals("")) {
+                                if (NSUpload.isIdValid(_id)) {
                                     NSUpload.removeCareportalEntryFromNS(_id);
+                                } else {
+                                    UploadQueue.removeID("dbAdd", _id);
                                 }
                                 MainApp.getDbHelper().delete(tempTarget);
                             }

app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsTemporaryBasalsFragment.java

@@ -31,6 +31,7 @@ import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.events.EventNewBG;
 import info.nightscout.androidaps.events.EventTempBasalChange;
 import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
+import info.nightscout.androidaps.plugins.NSClientInternal.UploadQueue;
 import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.DecimalFormatter;
 import info.nightscout.utils.NSUpload;
@@ -65,7 +66,7 @@ public class TreatmentsTemporaryBasalsFragment extends SubscriberFragment {
         public void onBindViewHolder(TempBasalsViewHolder holder, int position) {
             TemporaryBasal tempBasal = tempBasalList.getReversed(position);
             holder.ph.setVisibility(tempBasal.source == Source.PUMP ? View.VISIBLE : View.GONE);
-            holder.ns.setVisibility(tempBasal._id != null ? View.VISIBLE : View.GONE);
+            holder.ns.setVisibility(NSUpload.isIdValid(tempBasal._id) ? View.VISIBLE : View.GONE);
             if (tempBasal.isEndingEvent()) {
                 holder.date.setText(DateUtil.dateAndTimeString(tempBasal.date));
                 holder.duration.setText(MainApp.sResources.getString(R.string.cancel));
@@ -165,8 +166,10 @@ public class TreatmentsTemporaryBasalsFragment extends SubscriberFragment {
                         builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), new DialogInterface.OnClickListener() {
                             public void onClick(DialogInterface dialog, int id) {
                                 final String _id = tempBasal._id;
-                                if (_id != null && !_id.equals("")) {
+                                if (NSUpload.isIdValid(_id)) {
                                     NSUpload.removeCareportalEntryFromNS(_id);
+                                } else {
+                                    UploadQueue.removeID("dbAdd", _id);
                                 }
                                 MainApp.getDbHelper().delete(tempBasal);
                                 Answers.getInstance().logCustom(new CustomEvent("RemoveTempBasal"));

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

@@ -38,6 +38,7 @@ import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
 import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.RecordTypes;
 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.queue.Callback;
 import info.nightscout.utils.BolusWizard;
@@ -268,13 +269,15 @@ public class ActionStringHandler {
         } else if ("tddstats".equals(act[0])) {
             Object activePump = MainApp.getConfigBuilder().getActivePump();
             PumpInterface dana = MainApp.getSpecificPlugin(DanaRPlugin.class);
+            PumpInterface danaRS = MainApp.getSpecificPlugin(DanaRSPlugin.class);
             PumpInterface danaV2 = MainApp.getSpecificPlugin(DanaRv2Plugin.class);
             PumpInterface danaKorean = MainApp.getSpecificPlugin(DanaRKoreanPlugin.class);
 
 
             if ((dana == null || dana != activePump) &&
                     (danaV2 == null || danaV2 != activePump) &&
-                    (danaKorean == null || danaKorean != activePump)
+                    (danaKorean == null || danaKorean != activePump) &&
+                    (danaRS == null || danaRS != activePump)
                     ) {
                 sendError("Pump does not support TDDs!");
                 return;
@@ -579,9 +582,6 @@ public class ActionStringHandler {
         if (timeshift < 0 || timeshift > 23) {
             msg += String.format(MainApp.sResources.getString(R.string.openapsma_valueoutofrange), "Profile-Timeshift") + "\n";
         }
-        if (!SP.getBoolean("syncprofiletopump", false)) {
-            msg += MainApp.sResources.getString(R.string.syncprofiletopump_title) + " " + MainApp.sResources.getString(R.string.cpp_sync_setting_missing) + "\n";
-        }
         final Profile profile = MainApp.getConfigBuilder().getProfile();
 
         if (profile == null || profile.getBasal() == null) {

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

@@ -215,6 +215,8 @@ public class WearPlugin implements PluginBase {
 
     @Subscribe
     public void onStatusEvent(final EventDismissBolusprogressIfRunning ev) {
+        if(ev.result == null) return;
+
         String status;
         if(ev.result.success){
             status = MainApp.sResources.getString(R.string.success);

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

@@ -243,6 +243,7 @@ public class WatchUpdaterService extends WearableListenerService implements
 
         DataMap dataMap = new DataMap();
         dataMap.putString("sgvString", lastBG.valueToUnitsToString(units));
+        dataMap.putString("glucoseUnits", units);
         dataMap.putLong("timestamp", lastBG.date);
         if (glucoseStatus == null) {
             dataMap.putString("slopeArrow", "");
@@ -253,7 +254,6 @@ public class WatchUpdaterService extends WearableListenerService implements
             dataMap.putString("delta", deltastring(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units));
             dataMap.putString("avgDelta", deltastring(glucoseStatus.avgdelta, glucoseStatus.avgdelta * Constants.MGDL_TO_MMOLL, units));
         }
-
         dataMap.putLong("sgvLevel", sgvLevel);
         dataMap.putDouble("sgvDouble", lastBG.value);
         dataMap.putDouble("high", highLine);
@@ -316,7 +316,7 @@ public class WatchUpdaterService extends WearableListenerService implements
         if (last_bg == null) return;
 
         List<BgReading> graph_bgs = MainApp.getDbHelper().getBgreadingsDataFromTime(startTime, true);
-        GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
+        GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData(true);
 
         if (!graph_bgs.isEmpty()) {
             DataMap entries = dataMapSingleBG(last_bg, glucoseStatus);
@@ -533,7 +533,7 @@ public class WatchUpdaterService extends WearableListenerService implements
             String iobSum = DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob);
             String iobDetail = "(" + DecimalFormatter.to2Decimal(bolusIob.iob) + "|" + DecimalFormatter.to2Decimal(basalIob.basaliob) + ")";
             String cobString = generateCOBString();
-            String tempBasal = generateBasalString(treatmentsInterface);
+            String currentBasal = generateBasalString(treatmentsInterface);
 
             //bgi
             String bgiString = "";
@@ -543,7 +543,7 @@ public class WatchUpdaterService extends WearableListenerService implements
                 bgiString = "" + ((bgi >= 0) ? "+" : "") + DecimalFormatter.to1Decimal(bgi);
             }
 
-            String status = generateStatusString(profile, tempBasal,iobSum, iobDetail, bgiString);
+            String status = generateStatusString(profile, currentBasal,iobSum, iobDetail, bgiString);
 
             //batteries
             int phoneBattery = getBatteryLevel(getApplicationContext());
@@ -567,7 +567,7 @@ public class WatchUpdaterService extends WearableListenerService implements
             dataMapRequest.getDataMap().putString("iobDetail", iobDetail);
             dataMapRequest.getDataMap().putBoolean("detailedIob", mPrefs.getBoolean("wear_detailediob", false));
             dataMapRequest.getDataMap().putString("cob", cobString);
-            dataMapRequest.getDataMap().putString("tempBasal", tempBasal);
+            dataMapRequest.getDataMap().putString("currentBasal", currentBasal);
             dataMapRequest.getDataMap().putString("battery", "" + phoneBattery);
             dataMapRequest.getDataMap().putString("rigBattery", rigBattery);
             dataMapRequest.getDataMap().putLong("openApsStatus", openApsStatus);
@@ -598,7 +598,7 @@ public class WatchUpdaterService extends WearableListenerService implements
     }
 
     @NonNull
-    private String generateStatusString(Profile profile, String tempBasal, String iobSum, String iobDetail, String bgiString) {
+    private String generateStatusString(Profile profile, String currentBasal, String iobSum, String iobDetail, String bgiString) {
 
         String status = "";
 
@@ -623,7 +623,7 @@ public class WatchUpdaterService extends WearableListenerService implements
             iobString = iobSum + "U";
         }
 
-        status += tempBasal + " " + iobString;
+        status += currentBasal + " " + iobString;
 
         //add BGI if shown, otherwise return
         if (mPrefs.getBoolean("wear_showbgi", false)) {
@@ -636,10 +636,16 @@ public class WatchUpdaterService extends WearableListenerService implements
     @NonNull
     private String generateBasalString(TreatmentsInterface treatmentsInterface) {
 
-        String basalStringResult = "-.--U/h";
+        String basalStringResult;
         TemporaryBasal activeTemp = treatmentsInterface.getTempBasalFromHistory(System.currentTimeMillis());
         if (activeTemp != null) {
             basalStringResult = activeTemp.toStringShort();
+        } else {
+            if (SP.getBoolean(R.string.key_danar_visualizeextendedaspercentage, false)) {
+                basalStringResult = "100%";
+            } else {
+                basalStringResult = DecimalFormatter.to2Decimal(MainApp.getConfigBuilder().getProfile().getBasal()) + "U/h";
+            }
         }
         return basalStringResult;
     }
@@ -648,7 +654,7 @@ public class WatchUpdaterService extends WearableListenerService implements
     private String generateCOBString() {
 
         String cobStringResult = "--";
-        AutosensData autosensData = IobCobCalculatorPlugin.getAutosensData(System.currentTimeMillis());
+        AutosensData autosensData = IobCobCalculatorPlugin.getLastAutosensData();
         if (autosensData != null) {
             cobStringResult = (int) autosensData.cob + "g";
         }

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

@@ -128,7 +128,7 @@ public class CommandQueue {
 
     // After new command added to the queue
     // start thread again if not already running
-    private void notifyAboutNewCommand() {
+    private synchronized void notifyAboutNewCommand() {
         if (thread == null || thread.getState() == Thread.State.TERMINATED) {
             thread = new QueueThread(this);
             thread.start();
@@ -153,6 +153,10 @@ public class CommandQueue {
         // remove all unfinished boluses
         removeAll(Command.CommandType.BOLUS);
 
+        // apply constraints
+        detailedBolusInfo.insulin = MainApp.getConfigBuilder().applyBolusConstraints(detailedBolusInfo.insulin);
+        detailedBolusInfo.carbs = MainApp.getConfigBuilder().applyCarbsConstraints((int) detailedBolusInfo.carbs);
+
         // add new command to queue
         add(new CommandBolus(detailedBolusInfo, callback));
 
@@ -162,12 +166,8 @@ public class CommandQueue {
         MainApp.bus().post(new EventBolusRequested(detailedBolusInfo.insulin));
 
         // Bring up bolus progress dialog
-        detailedBolusInfo.insulin = MainApp.getConfigBuilder().applyBolusConstraints(detailedBolusInfo.insulin);
-        detailedBolusInfo.carbs = MainApp.getConfigBuilder().applyCarbsConstraints((int) detailedBolusInfo.carbs);
-
-        BolusProgressDialog bolusProgressDialog = null;
         if (detailedBolusInfo.context != null) {
-            bolusProgressDialog = new BolusProgressDialog();
+            BolusProgressDialog bolusProgressDialog = new BolusProgressDialog();
             bolusProgressDialog.setInsulin(detailedBolusInfo.insulin);
             bolusProgressDialog.show(((AppCompatActivity) detailedBolusInfo.context).getSupportFragmentManager(), "BolusProgress");
         } else {
@@ -203,7 +203,7 @@ public class CommandQueue {
     }
 
     // returns true if command is queued
-    public boolean tempBasalPercent(int percent, int durationInMinutes, Callback callback) {
+    public boolean tempBasalPercent(int percent, int durationInMinutes, boolean enforceNew, Callback callback) {
         if (isRunning(Command.CommandType.TEMPBASAL)) {
             if (callback != null)
                 callback.result(executingNowError()).run();
@@ -216,7 +216,7 @@ public class CommandQueue {
         Integer percentAfterConstraints = MainApp.getConfigBuilder().applyBasalConstraints(percent);
 
         // add new command to queue
-        add(new CommandTempBasalPercent(percentAfterConstraints, durationInMinutes, callback));
+        add(new CommandTempBasalPercent(percentAfterConstraints, durationInMinutes, enforceNew, callback));
 
         notifyAboutNewCommand();
 
@@ -326,14 +326,14 @@ public class CommandQueue {
 
     // returns true if command is queued
     public boolean readStatus(String reason, Callback callback) {
-        if (isRunning(Command.CommandType.READSTATUS)) {
-            if (callback != null)
-                callback.result(executingNowError()).run();
-            return false;
-        }
+        //if (isRunning(Command.CommandType.READSTATUS)) {
+        //    if (callback != null)
+        //        callback.result(executingNowError()).run();
+        //    return false;
+        //}
 
         // remove all unfinished 
-        removeAll(Command.CommandType.READSTATUS);
+        //removeAll(Command.CommandType.READSTATUS);
 
         // add new command to queue
         add(new CommandReadStatus(reason, callback));

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

@@ -29,6 +29,7 @@ public class QueueThread extends Thread {
     CommandQueue queue;
 
     private long connectionStartTime = 0;
+    private long lastCommandTime = 0;
     private boolean connectLogged = false;
 
     private PowerManager.WakeLock mWakeLock;
@@ -45,7 +46,7 @@ public class QueueThread extends Thread {
     public final void run() {
         mWakeLock.acquire();
         MainApp.bus().post(new EventQueueChanged());
-        connectionStartTime = System.currentTimeMillis();
+        connectionStartTime = lastCommandTime = System.currentTimeMillis();
 
         try {
             while (true) {
@@ -59,7 +60,7 @@ public class QueueThread extends Thread {
                 }
 
                 if (!pump.isConnected() && secondsElapsed > Constants.PUMP_MAX_CONNECTION_TIME_IN_SECONDS) {
-                    MainApp.bus().post(new EventDismissBolusprogressIfRunning(new PumpEnactResult()));
+                    MainApp.bus().post(new EventDismissBolusprogressIfRunning(null));
                     MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.connectiontimedout)));
                     log.debug("QUEUE: timed out");
                     pump.stopConnecting();
@@ -79,7 +80,7 @@ public class QueueThread extends Thread {
                         mBluetoothAdapter.enable();
                         SystemClock.sleep(1000);
                         //start over again once after watchdog barked
-                        connectionStartTime = System.currentTimeMillis();
+                        connectionStartTime = lastCommandTime = System.currentTimeMillis();
                     } else {
                         queue.clear();
                         return;
@@ -107,17 +108,24 @@ public class QueueThread extends Thread {
                         queue.performing().execute();
                         queue.resetPerforming();
                         MainApp.bus().post(new EventQueueChanged());
+                        lastCommandTime = System.currentTimeMillis();
                         SystemClock.sleep(100);
                         continue;
                     }
                 }
 
                 if (queue.size() == 0 && queue.performing() == null) {
+                    long secondsFromLastCommand = (System.currentTimeMillis() - lastCommandTime) / 1000;
+                    if (secondsFromLastCommand >= 5) {
                         log.debug("QUEUE: queue empty. disconnect");
                         MainApp.bus().post(new EventPumpStatusChanged(EventPumpStatusChanged.DISCONNECTING));
                         pump.disconnect("Queue empty");
                         MainApp.bus().post(new EventPumpStatusChanged(EventPumpStatusChanged.DISCONNECTED));
                         return;
+                    } else {
+                        log.debug("QUEUE: waiting for disconnect");
+                        SystemClock.sleep(1000);
+                    }
                 }
             }
         } finally {

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

@@ -1,8 +1,8 @@
 package info.nightscout.androidaps.queue.commands;
 
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.queue.Callback;
+import info.nightscout.utils.LocalAlertUtils;
 
 /**
  * Created by mike on 09.11.2017.
@@ -20,6 +20,7 @@ public class CommandReadStatus extends Command {
     @Override
     public void execute() {
         ConfigBuilderPlugin.getActivePump().getPumpStatus();
+        LocalAlertUtils.notifyPumpStatusRead();
         if (callback != null)
             callback.result(null).run();
     }

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

@@ -18,17 +18,19 @@ public class CommandTempBasalPercent extends Command {
 
     int durationInMinutes;
     int percent;
+    boolean enforceNew;
 
-    public CommandTempBasalPercent(int percent, int durationInMinutes, Callback callback) {
+    public CommandTempBasalPercent(int percent, int durationInMinutes, boolean enforceNew, Callback callback) {
         commandType = CommandType.TEMPBASAL;
         this.percent = percent;
         this.durationInMinutes = durationInMinutes;
+        this.enforceNew = enforceNew;
         this.callback = callback;
     }
 
     @Override
     public void execute() {
-        PumpEnactResult r = ConfigBuilderPlugin.getActivePump().setTempBasalPercent(percent, durationInMinutes);
+        PumpEnactResult r = ConfigBuilderPlugin.getActivePump().setTempBasalPercent(percent, durationInMinutes, enforceNew);
         if (Config.logCongigBuilderActions)
             log.debug("setTempBasalPercent percent: " + percent + " durationInMinutes: " + durationInMinutes + " success: " + r.success + " enacted: " + r.enacted);
         if (callback != null)

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

@@ -16,61 +16,39 @@ import org.slf4j.LoggerFactory;
 
 import java.util.Date;
 
-import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.db.BgReading;
-import info.nightscout.androidaps.db.DatabaseHelper;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
+import info.nightscout.utils.LocalAlertUtils;
 import info.nightscout.utils.SP;
 
 public class KeepAliveReceiver extends BroadcastReceiver {
     private static Logger log = LoggerFactory.getLogger(KeepAliveReceiver.class);
     public static final long STATUS_UPDATE_FREQUENCY = 15 * 60 * 1000L;
 
-    // TODO consider moving this into an Alarms plugin that works offline and can be configured
-    // (e.g. override silent mode at night only)
-
-    private static int missedReadingsThreshold() {
-        return SP.getInt(MainApp.sResources.getString(R.string.key_missed_bg_readings_threshold), 30) * 60 * 1000;
+    public static void cancelAlarm(Context context) {
+        Intent intent = new Intent(context, KeepAliveReceiver.class);
+        PendingIntent sender = PendingIntent.getBroadcast(context, 0, intent, 0);
+        AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
+        alarmManager.cancel(sender);
     }
 
-    private static int pumpUnreachableThreshold() {
-        return SP.getInt(MainApp.sResources.getString(R.string.key_pump_unreachable_threshold), 30) * 60 * 1000;
-    }
-
-
     @Override
     public void onReceive(Context context, Intent rIntent) {
         PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
         PowerManager.WakeLock wl = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "");
         wl.acquire();
 
-        shortenSnoozeInterval();
-        checkBg();
+        LocalAlertUtils.shortenSnoozeInterval();
+        LocalAlertUtils.checkStaleBGAlert();
         checkPump();
 
         log.debug("KeepAlive received");
         wl.release();
     }
 
-    private void checkBg() {
-        BgReading bgReading = DatabaseHelper.lastBg();
-        if (SP.getBoolean(MainApp.sResources.getString(R.string.key_enable_missed_bg_readings_alert), false)
-                && bgReading != null && bgReading.date + missedReadingsThreshold() < System.currentTimeMillis()
-                && SP.getLong("nextMissedReadingsAlarm", 0l) < System.currentTimeMillis()) {
-            Notification n = new Notification(Notification.BG_READINGS_MISSED, MainApp.sResources.getString(R.string.missed_bg_readings), Notification.URGENT);
-            n.soundId = R.raw.alarm;
-            SP.putLong("nextMissedReadingsAlarm", System.currentTimeMillis() + missedReadingsThreshold());
-            MainApp.bus().post(new EventNewNotification(n));
-        }
-    }
-
     private void checkPump() {
         final PumpInterface pump = ConfigBuilderPlugin.getActivePump();
         final Profile profile = MainApp.getConfigBuilder().getProfile();
@@ -79,18 +57,9 @@ public class KeepAliveReceiver extends BroadcastReceiver {
             boolean isStatusOutdated = lastConnection.getTime() + STATUS_UPDATE_FREQUENCY < System.currentTimeMillis();
             boolean isBasalOutdated = Math.abs(profile.getBasal() - pump.getBaseBasalRate()) > pump.getPumpDescription().basalStep;
 
-            boolean alarmTimeoutExpired = lastConnection.getTime() + pumpUnreachableThreshold() < System.currentTimeMillis();
-            boolean nextAlarmOccurrenceReached = SP.getLong("nextPumpDisconnectedAlarm", 0l) < System.currentTimeMillis();
+            LocalAlertUtils.checkPumpUnreachableAlarm(lastConnection, isStatusOutdated);
 
-            if (Config.APS && SP.getBoolean(MainApp.sResources.getString(R.string.key_enable_pump_unreachable_alert), true)
-                    && isStatusOutdated && alarmTimeoutExpired && nextAlarmOccurrenceReached && !ConfigBuilderPlugin.getActiveLoop().isDisconnected()) {
-                Notification n = new Notification(Notification.PUMP_UNREACHABLE, MainApp.sResources.getString(R.string.pump_unreachable), Notification.URGENT);
-                n.soundId = R.raw.alarm;
-                SP.putLong("nextPumpDisconnectedAlarm", System.currentTimeMillis() + pumpUnreachableThreshold());
-                MainApp.bus().post(new EventNewNotification(n));
-            }
-
-            if (SP.getBoolean("syncprofiletopump", false) && !pump.isThisProfileSet(profile)) {
+            if (!pump.isThisProfileSet(profile)) {
                 MainApp.getConfigBuilder().getCommandQueue().setProfile(profile, null);
             } else if (isStatusOutdated && !pump.isBusy()) {
                 MainApp.getConfigBuilder().getCommandQueue().readStatus("KeepAlive. Status outdated.", null);
@@ -103,8 +72,8 @@ public class KeepAliveReceiver extends BroadcastReceiver {
     //called by MainApp at first app start
     public void setAlarm(Context context) {
 
-        shortenSnoozeInterval();
-        presnoozeAlarms();
+        LocalAlertUtils.shortenSnoozeInterval();
+        LocalAlertUtils.presnoozeAlarms();
 
         AlarmManager am = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
         Intent i = new Intent(context, KeepAliveReceiver.class);
@@ -117,33 +86,4 @@ public class KeepAliveReceiver extends BroadcastReceiver {
         am.setInexactRepeating(AlarmManager.RTC_WAKEUP, System.currentTimeMillis(), Constants.keepAliveMsecs, pi);
     }
 
-    /*Presnoozes the alarms with 5 minutes if no snooze exists.
-     * Call only at startup!
-     */
-    public void presnoozeAlarms() {
-        if (SP.getLong("nextMissedReadingsAlarm", 0l) < System.currentTimeMillis()) {
-            SP.putLong("nextMissedReadingsAlarm", System.currentTimeMillis() + 5 * 60 * 1000);
-        }
-        if (SP.getLong("nextPumpDisconnectedAlarm", 0l) < System.currentTimeMillis()) {
-            SP.putLong("nextPumpDisconnectedAlarm", System.currentTimeMillis() + 5 * 60 * 1000);
-        }
-    }
-
-    public void cancelAlarm(Context context) {
-        Intent intent = new Intent(context, KeepAliveReceiver.class);
-        PendingIntent sender = PendingIntent.getBroadcast(context, 0, intent, 0);
-        AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
-        alarmManager.cancel(sender);
-    }
-
-    static void shortenSnoozeInterval() {
-        //shortens alarm times in case of setting changes or future data
-        long nextMissedReadingsAlarm = SP.getLong("nextMissedReadingsAlarm", 0L);
-        nextMissedReadingsAlarm = Math.min(System.currentTimeMillis() + missedReadingsThreshold(), nextMissedReadingsAlarm);
-        SP.putLong("nextMissedReadingsAlarm", nextMissedReadingsAlarm);
-
-        long nextPumpDisconnectedAlarm = SP.getLong("nextPumpDisconnectedAlarm", 0L);
-        nextPumpDisconnectedAlarm = Math.min(System.currentTimeMillis() + pumpUnreachableThreshold(), nextPumpDisconnectedAlarm);
-        SP.putLong("nextPumpDisconnectedAlarm", nextPumpDisconnectedAlarm);
-    }
 }

app/src/main/java/info/nightscout/androidaps/tabs/TabPageAdapter.java

@@ -9,8 +9,12 @@ import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentStatePagerAdapter;
 import android.view.ViewGroup;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.ArrayList;
 
+import info.nightscout.androidaps.MainActivity;
 import info.nightscout.androidaps.interfaces.PluginBase;
 
 /**
@@ -22,6 +26,8 @@ public class TabPageAdapter extends FragmentStatePagerAdapter {
 
     Context context;
 
+    private static Logger log = LoggerFactory.getLogger(TabPageAdapter.class);
+
     public TabPageAdapter(FragmentManager fm, Context context) {
         super(fm);
         this.context = context;
@@ -40,6 +46,8 @@ public class TabPageAdapter extends FragmentStatePagerAdapter {
             super.finishUpdate(container);
         } catch (NullPointerException nullPointerException){
             System.out.println("Catch the NullPointerException in FragmentStatePagerAdapter.finishUpdate");
+        } catch (IllegalStateException e){
+            log.error(e.getMessage());
         }
     }
 

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

@@ -14,15 +14,15 @@ import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 
 public class BolusWizard {
     // Inputs
-    Profile specificProfile = null;
-    TempTarget tempTarget;
+    private Profile specificProfile = null;
+    private TempTarget tempTarget;
     public Integer carbs = 0;
-    Double bg = 0d;
-    Double correction;
-    Boolean includeBolusIOB = true;
-    Boolean includeBasalIOB = true;
-    Boolean superBolus = false;
-    Boolean trend = false;
+    private Double bg = 0d;
+    private Double correction;
+    private Boolean includeBolusIOB = true;
+    private Boolean includeBasalIOB = true;
+    public Boolean superBolus = false;
+    private Boolean trend = false;
 
     // Intermediate
     public Double sens = 0d;
@@ -71,7 +71,9 @@ public class BolusWizard {
             targetBGLow = Profile.fromMgdlToUnits(tempTarget.low, specificProfile.getUnits());
             targetBGHigh = Profile.fromMgdlToUnits(tempTarget.high, specificProfile.getUnits());
         }
-        if (bg <= targetBGLow) {
+        if (bg >= targetBGLow && bg <= targetBGHigh) {
+            bgDiff = 0d;
+        } else if (bg <= targetBGLow) {
             bgDiff = bg - targetBGLow;
         } else {
             bgDiff = bg - targetBGHigh;

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

@@ -2,10 +2,12 @@ package info.nightscout.utils;
 
 import android.support.v4.util.LongSparseArray;
 import android.text.format.DateUtils;
-import android.util.SparseIntArray;
+
+import org.joda.time.DateTime;
+import org.joda.time.format.DateTimeFormatter;
+import org.joda.time.format.ISODateTimeFormat;
 
 import java.text.DateFormat;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
@@ -27,9 +29,7 @@ public class DateUtil {
     /**
      * The date format in iso.
      */
-    private static String FORMAT_DATE_ISO = "yyyy-MM-dd'T'HH:mm:ssZ";
-    private static String FORMAT_DATE_ISO_MSEC = "yyyy-MM-dd'T'HH:mm:ss.SSSZ";
-    private static String FORMAT_DATE_ISO_MSEC_UTC = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
+    private static String FORMAT_DATE_ISO_OUT = "yyyy-MM-dd'T'HH:mm:ss'Z'";
 
     /**
      * Takes in an ISO date string of the following format:
@@ -41,33 +41,10 @@ public class DateUtil {
      */
     public static Date fromISODateString(String isoDateString)
             throws Exception {
-        SimpleDateFormat f = new SimpleDateFormat(FORMAT_DATE_ISO, Locale.getDefault());
-        Date date;
 
-        f.setTimeZone(TimeZone.getTimeZone("UTC"));
-        try {
-            date = f.parse(isoDateString);
-            return date;
-        } catch (ParseException e) {
-        }
-
-        f = new SimpleDateFormat(FORMAT_DATE_ISO_MSEC, Locale.getDefault());
-        f.setTimeZone(TimeZone.getTimeZone("UTC"));
-        try {
-            date = f.parse(isoDateString);
-            return date;
-        } catch (ParseException e) {
-        }
-
-        f = new SimpleDateFormat(FORMAT_DATE_ISO_MSEC_UTC, Locale.getDefault());
-        f.setTimeZone(TimeZone.getTimeZone("UTC"));
-        try {
-            date = f.parse(isoDateString);
-            return date;
-        } catch (ParseException e) {
-        }
-
-        throw new ParseException("Unparseable date: " + isoDateString, 0);
+        DateTimeFormatter parser = ISODateTimeFormat.dateTimeParser();
+        DateTime dateTime = DateTime.parse(isoDateString, parser);
+        return dateTime.toDate();
     }
 
     /**
@@ -79,7 +56,7 @@ public class DateUtil {
      * @return the iso-formatted date string
      */
     public static String toISOString(Date date, String format, TimeZone tz) {
-        if (format == null) format = FORMAT_DATE_ISO;
+        if (format == null) format = FORMAT_DATE_ISO_OUT;
         if (tz == null) tz = TimeZone.getDefault();
         DateFormat f = new SimpleDateFormat(format, Locale.getDefault());
         f.setTimeZone(tz);
@@ -87,21 +64,18 @@ public class DateUtil {
     }
 
     public static String toISOString(Date date) {
-        return toISOString(date, FORMAT_DATE_ISO, TimeZone.getTimeZone("UTC"));
+        return toISOString(date, FORMAT_DATE_ISO_OUT, TimeZone.getTimeZone("UTC"));
     }
 
     public static String toISOString(long date) {
-        return toISOString(new Date(date), FORMAT_DATE_ISO, TimeZone.getTimeZone("UTC"));
+        return toISOString(new Date(date), FORMAT_DATE_ISO_OUT, TimeZone.getTimeZone("UTC"));
     }
 
     public static Date toDate(Integer seconds) {
         Calendar calendar = new GregorianCalendar();
         calendar.set(Calendar.HOUR_OF_DAY, seconds / 60 / 60);
-        String a = calendar.getTime().toString();
         calendar.set(Calendar.MINUTE, (seconds / 60) % 60);
-        String b = calendar.getTime().toString();
         calendar.set(Calendar.SECOND, 0);
-        String c = calendar.getTime().toString();
         return calendar.getTime();
     }
 

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

@@ -0,0 +1,96 @@
+package info.nightscout.utils;
+
+import android.app.AlarmManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+
+import java.util.Date;
+
+import info.nightscout.androidaps.Config;
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.data.Profile;
+import info.nightscout.androidaps.db.BgReading;
+import info.nightscout.androidaps.db.DatabaseHelper;
+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.androidaps.receivers.KeepAliveReceiver;
+
+/**
+ * Created by adrian on 17/12/17.
+ */
+
+public class LocalAlertUtils {
+    public static int missedReadingsThreshold() {
+        return SP.getInt(MainApp.sResources.getString(R.string.key_missed_bg_readings_threshold), 30) * 60 * 1000;
+    }
+
+    private static int pumpUnreachableThreshold() {
+        return SP.getInt(MainApp.sResources.getString(R.string.key_pump_unreachable_threshold), 30) * 60 * 1000;
+    }
+
+    public static void checkPumpUnreachableAlarm(Date lastConnection, boolean isStatusOutdated) {
+        boolean alarmTimeoutExpired = lastConnection.getTime() + pumpUnreachableThreshold() < System.currentTimeMillis();
+        boolean nextAlarmOccurrenceReached = SP.getLong("nextPumpDisconnectedAlarm", 0l) < System.currentTimeMillis();
+
+        if (Config.APS && SP.getBoolean(MainApp.sResources.getString(R.string.key_enable_pump_unreachable_alert), true)
+                && isStatusOutdated && alarmTimeoutExpired && nextAlarmOccurrenceReached && !ConfigBuilderPlugin.getActiveLoop().isDisconnected()) {
+            Notification n = new Notification(Notification.PUMP_UNREACHABLE, MainApp.sResources.getString(R.string.pump_unreachable), Notification.URGENT);
+            n.soundId = R.raw.alarm;
+            SP.putLong("nextPumpDisconnectedAlarm", System.currentTimeMillis() + pumpUnreachableThreshold());
+            MainApp.bus().post(new EventNewNotification(n));
+        }
+    }
+
+    /*Presnoozes the alarms with 5 minutes if no snooze exists.
+         * Call only at startup!
+         */
+    public static void presnoozeAlarms() {
+        if (SP.getLong("nextMissedReadingsAlarm", 0l) < System.currentTimeMillis()) {
+            SP.putLong("nextMissedReadingsAlarm", System.currentTimeMillis() + 5 * 60 * 1000);
+        }
+        if (SP.getLong("nextPumpDisconnectedAlarm", 0l) < System.currentTimeMillis()) {
+            SP.putLong("nextPumpDisconnectedAlarm", System.currentTimeMillis() + 5 * 60 * 1000);
+        }
+    }
+
+    public static void shortenSnoozeInterval() {
+        //shortens alarm times in case of setting changes or future data
+        long nextMissedReadingsAlarm = SP.getLong("nextMissedReadingsAlarm", 0L);
+        nextMissedReadingsAlarm = Math.min(System.currentTimeMillis() + missedReadingsThreshold(), nextMissedReadingsAlarm);
+        SP.putLong("nextMissedReadingsAlarm", nextMissedReadingsAlarm);
+
+        long nextPumpDisconnectedAlarm = SP.getLong("nextPumpDisconnectedAlarm", 0L);
+        nextPumpDisconnectedAlarm = Math.min(System.currentTimeMillis() + pumpUnreachableThreshold(), nextPumpDisconnectedAlarm);
+        SP.putLong("nextPumpDisconnectedAlarm", nextPumpDisconnectedAlarm);
+    }
+
+    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 Profile profile = MainApp.getConfigBuilder().getProfile();
+        if (pump != null && profile != null && profile.getBasal() != null) {
+            Date lastConnection = pump.lastDataTime();
+            long earliestAlarmTime = lastConnection.getTime() + pumpUnreachableThreshold();
+            if (SP.getLong("nextPumpDisconnectedAlarm", 0l) < earliestAlarmTime) {
+                SP.putLong("nextPumpDisconnectedAlarm", earliestAlarmTime);
+            }
+        }
+    }
+
+    public static void checkStaleBGAlert() {
+        BgReading bgReading = DatabaseHelper.lastBg();
+        if (SP.getBoolean(MainApp.sResources.getString(R.string.key_enable_missed_bg_readings_alert), false)
+                && bgReading != null && bgReading.date + missedReadingsThreshold() < System.currentTimeMillis()
+                && SP.getLong("nextMissedReadingsAlarm", 0l) < System.currentTimeMillis()) {
+            Notification n = new Notification(Notification.BG_READINGS_MISSED, MainApp.sResources.getString(R.string.missed_bg_readings), Notification.URGENT);
+            n.soundId = R.raw.alarm;
+            SP.putLong("nextMissedReadingsAlarm", System.currentTimeMillis() + missedReadingsThreshold());
+            MainApp.bus().post(new EventNewNotification(n));
+        }
+    }
+}

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

@@ -493,4 +493,11 @@ public class NSUpload {
 
     }
 
+    public static boolean isIdValid(String _id) {
+        if (_id == null)
+            return false;
+        if (_id.length() == 24)
+            return true;
+        return false;
+    }
 }

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

@@ -0,0 +1,21 @@
+package info.nightscout.utils;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Created by mike on 22.12.2017.
+ */
+
+public class PercentageSplitter {
+    public static String pureName(String name) {
+        String newName = name;
+        String s = "(.*)\\((\\d+)\\%\\)";
+        Pattern r = Pattern.compile(s);
+        Matcher m = r.matcher(name);
+        if (m.find()) {
+            newName = m.group(1);
+        }
+        return newName;
+    }
+}

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

@@ -0,0 +1,67 @@
+package info.nightscout.utils;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.SystemClock;
+import android.support.annotation.Nullable;
+import android.util.AttributeSet;
+import android.view.View;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Created by mike on 22.12.2017.
+ */
+
+public class SingleClickButton extends android.support.v7.widget.AppCompatButton implements View.OnClickListener {
+    private static Logger log = LoggerFactory.getLogger(SingleClickButton.class);
+
+    Context context;
+    OnClickListener listener = null;
+
+    public SingleClickButton(Context context) {
+        super(context);
+        this.context = context;
+        super.setOnClickListener(this);
+    }
+
+    public SingleClickButton(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        this.context = context;
+        super.setOnClickListener(this);
+    }
+
+    public SingleClickButton(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        this.context = context;
+        super.setOnClickListener(this);
+    }
+
+    @Override
+    public void setOnClickListener(@Nullable OnClickListener l) {
+        listener = l;
+    }
+
+    @Override
+    public void onClick(final View v) {
+        setEnabled(false);
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                SystemClock.sleep(3000);
+                Activity activity = (Activity) context;
+                if (activity != null)
+                    activity.runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            setEnabled(true);
+                            log.debug("Button enabled");
+                        }
+                    });
+            }
+        }).start();
+        if (listener != null)
+            listener.onClick(v);
+    }
+}

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

@@ -52,6 +52,8 @@ public class TimeListEdit {
     private JSONArray data1;
     private JSONArray data2;
     private double step;
+    private double min;
+    private double max;
     private NumberFormat formatter;
     private Runnable save;
     private LinearLayout layout;
@@ -59,7 +61,7 @@ public class TimeListEdit {
     private int inflatedUntil = -1;
 
 
-    public TimeListEdit(Context context, View view, int resLayoutId, String label, JSONArray data1, JSONArray data2, double step, NumberFormat formatter, Runnable save) {
+    public TimeListEdit(Context context, View view, int resLayoutId, String label, JSONArray data1, JSONArray data2, double min, double max, double step, NumberFormat formatter, Runnable save) {
         this.context = context;
         this.view = view;
         this.resLayoutId = resLayoutId;
@@ -67,6 +69,8 @@ public class TimeListEdit {
         this.data1 = data1;
         this.data2 = data2;
         this.step = step;
+        this.min = min;
+        this.max = max;
         this.formatter = formatter;
         this.save = save;
         buildView();
@@ -239,8 +243,8 @@ public class TimeListEdit {
         if (i == 0) next = ONEHOURINSECONDS;
         fillSpinner(timeSpinner, secondFromMidnight(i), previous, next);
 
-        editText1.setParams(value1(i), 0.1d, 100d, step, formatter, false);
-        editText2.setParams(value2(i), 0.1d, 100d, step, formatter, false);
+        editText1.setParams(value1(i), min, max, step, formatter, false);
+        editText2.setParams(value2(i), min, max, step, formatter, false);
 
         if (data2 == null) {
             editText2.setVisibility(View.GONE);

app/src/main/res/layout/actions_fragment.xml

@@ -13,7 +13,7 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <Button
+            <info.nightscout.utils.SingleClickButton
                 android:id="@+id/actions_profileswitch"
                 style="?android:attr/buttonStyle"
                 android:layout_width="fill_parent"
@@ -26,7 +26,7 @@
                 android:drawableTop="@drawable/icon_actions_profileswitch"
                 android:text="@string/careportal_profileswitch" />
 
-            <Button
+            <info.nightscout.utils.SingleClickButton
                 android:id="@+id/actions_temptarget"
                 style="?android:attr/buttonStyle"
                 android:layout_width="fill_parent"
@@ -39,7 +39,7 @@
                 android:drawableTop="@drawable/icon_actions_temptarget"
                 android:text="@string/careportal_temporarytarget" />
 
-            <Button
+            <info.nightscout.utils.SingleClickButton
                 android:id="@+id/actions_settempbasal"
                 style="?android:attr/buttonStyle"
                 android:layout_width="fill_parent"
@@ -52,7 +52,7 @@
                 android:drawableTop="@drawable/icon_actions_starttempbasal"
                 android:text="@string/overview_tempbasal_button" />
 
-            <Button
+            <info.nightscout.utils.SingleClickButton
                 android:id="@+id/actions_canceltempbasal"
                 style="?android:attr/buttonStyle"
                 android:layout_width="fill_parent"
@@ -65,7 +65,7 @@
                 android:drawableTop="@drawable/icon_cancelbasal"
                 android:text="Cancel temp basal" />
 
-            <Button
+            <info.nightscout.utils.SingleClickButton
                 android:id="@+id/actions_extendedbolus"
                 style="?android:attr/buttonStyle"
                 android:layout_width="fill_parent"
@@ -78,7 +78,7 @@
                 android:drawableTop="@drawable/icon_actions_startextbolus"
                 android:text="@string/overview_extendedbolus_button" />
 
-            <Button
+            <info.nightscout.utils.SingleClickButton
                 android:id="@+id/actions_extendedbolus_cancel"
                 style="?android:attr/buttonStyle"
                 android:layout_width="fill_parent"
@@ -91,7 +91,7 @@
                 android:drawableTop="@drawable/icon_actions_cancelextbolus"
                 android:text="@string/overview_extendedbolus_cancel_button" />
 
-            <Button
+            <info.nightscout.utils.SingleClickButton
                 android:id="@+id/actions_fill"
                 style="?android:attr/buttonStyle"
                 android:layout_width="fill_parent"

app/src/main/res/layout/bgsource_fragment.xml

@@ -0,0 +1,22 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="info.nightscout.androidaps.plugins.SourceDexcomG5.BGSourceFragment">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/bgsource_recyclerview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+        </android.support.v7.widget.RecyclerView>
+
+    </LinearLayout>
+
+</FrameLayout>

app/src/main/res/layout/bgsource_item.xml

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/bgsource_cardview"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    card_view:cardBackgroundColor="@color/cardColorBackground"
+    card_view:cardCornerRadius="6dp"
+    card_view:cardUseCompatPadding="true"
+    card_view:contentPadding="6dp">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/bgsource_date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="16:55"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/bgsource_value"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingStart="10dp"
+                android:text="Name"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/bgsource_direction"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:paddingStart="10dp"
+                android:text="-" />
+
+            <TextView
+                android:id="@+id/ns_sign"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingStart="10dp"
+                android:text="NS"
+                android:textAlignment="viewEnd"
+                android:textColor="@color/colorSetTempButton" />
+
+            <TextView
+                android:id="@+id/invalid_sign"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingStart="10dp"
+                android:text="@string/invalid"
+                android:textColor="@android:color/holo_red_light" />
+
+            <TextView
+                android:id="@+id/bgsource_remove"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingEnd="5dp"
+                android:paddingStart="10dp"
+                android:text="@string/overview_quickwizard_item_remove_button"
+                android:textAlignment="viewEnd"
+                android:textColor="@android:color/holo_orange_light" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</android.support.v7.widget.CardView>

app/src/main/res/layout/careportal_fragment.xml

@@ -51,7 +51,7 @@
                     android:padding="10dip"
                     app:columnCount="3">
 
-                    <Button
+                    <info.nightscout.utils.SingleClickButton
                         android:id="@+id/careportal_bgcheck"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0px"
@@ -66,7 +66,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="0" />
 
-                    <Button
+                    <info.nightscout.utils.SingleClickButton
                         android:id="@+id/careportal_exercise"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -80,7 +80,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="0" />
 
-                    <Button
+                    <info.nightscout.utils.SingleClickButton
                         android:id="@+id/careportal_temporarytarget"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -111,7 +111,7 @@
                     android:padding="10dip"
                     app:columnCount="3">
 
-                    <Button
+                    <info.nightscout.utils.SingleClickButton
                         android:id="@+id/careportal_snackbolus"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -125,7 +125,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="1" />
 
-                    <Button
+                    <info.nightscout.utils.SingleClickButton
                         android:id="@+id/careportal_mealbolus"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -139,7 +139,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="1" />
 
-                    <Button
+                    <info.nightscout.utils.SingleClickButton
                         android:id="@+id/careportal_correctionbolus"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -153,7 +153,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="1" />
 
-                    <Button
+                    <info.nightscout.utils.SingleClickButton
                         android:id="@+id/careportal_carbscorrection"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -167,7 +167,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="2" />
 
-                    <Button
+                    <info.nightscout.utils.SingleClickButton
                         android:id="@+id/careportal_combobolus"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -181,7 +181,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="2" />
 
-                    <Button
+                    <info.nightscout.utils.SingleClickButton
                         android:id="@+id/careportal_tempbasalstart"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -195,7 +195,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="2" />
 
-                    <Button
+                    <info.nightscout.utils.SingleClickButton
                         android:id="@+id/careportal_tempbasalend"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -225,7 +225,7 @@
                     android:padding="10dip"
                     app:columnCount="3">
 
-                    <Button
+                    <info.nightscout.utils.SingleClickButton
                         android:id="@+id/careportal_cgmsensorstart"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -240,7 +240,7 @@
                         app:layout_row="1" />
 
 
-                    <Button
+                    <info.nightscout.utils.SingleClickButton
                         android:id="@+id/careportal_cgmsensorinsert"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -255,7 +255,7 @@
                         app:layout_row="1" />
 
 
-                    <Button
+                    <info.nightscout.utils.SingleClickButton
                         android:id="@+id/careportal_openapsoffline"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -270,7 +270,7 @@
                         app:layout_row="1" />
 
 
-                    <Button
+                    <info.nightscout.utils.SingleClickButton
                         android:id="@+id/careportal_announcement"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -284,7 +284,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="4" />
 
-                    <Button
+                    <info.nightscout.utils.SingleClickButton
                         android:id="@+id/careportal_question"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -298,7 +298,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="4" />
 
-                    <Button
+                    <info.nightscout.utils.SingleClickButton
                         android:id="@+id/careportal_note"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -328,7 +328,7 @@
                     android:padding="10dip"
                     app:columnCount="3">
 
-                    <Button
+                    <info.nightscout.utils.SingleClickButton
                         android:id="@+id/careportal_pumpsitechange"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -342,7 +342,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="0" />
 
-                    <Button
+                    <info.nightscout.utils.SingleClickButton
                         android:id="@+id/careportal_insulincartridgechange"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -356,7 +356,7 @@
                         app:layout_gravity="fill"
                         app:layout_row="0" />
 
-                    <Button
+                    <info.nightscout.utils.SingleClickButton
                         android:id="@+id/careportal_profileswitch"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
@@ -371,7 +371,7 @@
                         app:layout_row="0" />
 
 
-                    <Button
+                    <info.nightscout.utils.SingleClickButton
                         android:id="@+id/careportal_pumpbatterychange"
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"

app/src/main/res/layout/overview_editquickwizard_dialog.xml

@@ -4,70 +4,157 @@
     android:layout_height="match_parent"
     tools:context="info.nightscout.androidaps.plugins.Overview.Dialogs.EditQuickWizardDialog">
 
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_margin="15dp">
-
-        <TextView
-            android:text="@string/overview_editquickwizard_buttontext"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="@android:style/TextAppearance.Material.Medium" />
-
-        <EditText
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inputType="text"
-            android:ems="10"
-            android:id="@+id/overview_editquickwizard_button_edit" />
-
-        <TextView
-            android:text="@string/overview_editquickwizard_carbs"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="@android:style/TextAppearance.Material.Medium" />
-
-        <EditText
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inputType="numberDecimal"
-            android:ems="10"
-            android:id="@+id/overview_editquickwizard_carbs_edit" />
-
-        <TextView
-            android:text="@string/overview_editquickwizard_valid"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="@android:style/TextAppearance.Material.Medium" />
-
-        <LinearLayout
-            android:orientation="horizontal"
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-            <Spinner
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_margin="15dp"
+            android:orientation="vertical">
+
+            <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:text="@string/overview_editquickwizard_buttontext"
+                android:textAppearance="@android:style/TextAppearance.Material.Medium" />
+
+            <EditText
+                android:id="@+id/overview_editquickwizard_button_edit"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ems="10"
+                android:inputType="text" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/overview_editquickwizard_carbs"
+                android:textAppearance="@android:style/TextAppearance.Material.Medium" />
+
+            <EditText
+                android:id="@+id/overview_editquickwizard_carbs_edit"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ems="10"
+                android:inputType="numberDecimal" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/overview_editquickwizard_valid"
+                android:textAppearance="@android:style/TextAppearance.Material.Medium" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <Spinner
                     android:id="@+id/overview_editquickwizard_from_spinner"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_weight="1" />
 
                 <Spinner
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
                     android:id="@+id/overview_editquickwizard_to_spinner"
-                android:layout_weight="1" />
-
-        </LinearLayout>
-
-        <Button
-            android:text="@string/ok"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-            android:id="@+id/overview_editquickwizard_ok_button"
                     android:layout_weight="1" />
 
             </LinearLayout>
 
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/overview_editquickwizard_usebg"
+                android:textAppearance="@android:style/TextAppearance.Material.Medium" />
+
+            <Spinner
+                android:id="@+id/overview_editquickwizard_usebg_spinner"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:entries="@array/quickWizardUseBGArray" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/overview_editquickwizard_usebolusiob"
+                android:textAppearance="@android:style/TextAppearance.Material.Medium" />
+
+            <Spinner
+                android:id="@+id/overview_editquickwizard_usebolusiob_spinner"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:entries="@array/quickWizardUseBolusIOBArray" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/overview_editquickwizard_usebasaliob"
+                android:textAppearance="@android:style/TextAppearance.Material.Medium" />
+
+            <Spinner
+                android:id="@+id/overview_editquickwizard_usebasaliob_spinner"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:entries="@array/quickWizardUseBasalOBArray" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/overview_editquickwizard_usecob"
+                android:textAppearance="@android:style/TextAppearance.Material.Medium" />
+
+            <Spinner
+                android:id="@+id/overview_editquickwizard_usecob_spinner"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:entries="@array/quickWizardUseCOBArray" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/overview_editquickwizard_usetrend"
+                android:textAppearance="@android:style/TextAppearance.Material.Medium" />
+
+            <Spinner
+                android:id="@+id/overview_editquickwizard_usetrend_spinner"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:entries="@array/quickWizardUseTrendArray" />
+
+            <TextView
+                android:id="@+id/overview_editquickwizard_usesuperbolus_label"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/overview_editquickwizard_usesuperbolus"
+                android:textAppearance="@android:style/TextAppearance.Material.Medium" />
+
+            <Spinner
+                android:id="@+id/overview_editquickwizard_usesuperbolus_spinner"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:entries="@array/quickWizardUseSuperBolusArray" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/overview_editquickwizard_usetemptarget"
+                android:textAppearance="@android:style/TextAppearance.Material.Medium" />
+
+            <Spinner
+                android:id="@+id/overview_editquickwizard_usetemptarget_spinner"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:entries="@array/quickWizardUseTempTargetArray" />
+
+            <include layout="@layout/mdtp_done_button" />
+
+        </LinearLayout>
+
+    </ScrollView>
+
 </FrameLayout>

app/src/main/res/layout/overview_fragment.xml

@@ -381,7 +381,7 @@
                 android:orientation="horizontal"
                 android:visibility="gone">
 
-                <Button
+                <info.nightscout.utils.SingleClickButton
                     android:id="@+id/overview_accepttempbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="match_parent"
@@ -398,7 +398,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-                <Button
+                <info.nightscout.utils.SingleClickButton
                     android:id="@+id/overview_treatmentbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
@@ -413,7 +413,7 @@
                     android:textSize="10sp"
                     android:visibility="gone" />
 
-                <Button
+                <info.nightscout.utils.SingleClickButton
                     android:id="@+id/overview_wizardbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
@@ -428,7 +428,7 @@
                     android:textSize="10sp"
                     android:visibility="gone" />
 
-                <Button
+                <info.nightscout.utils.SingleClickButton
                     android:id="@+id/overview_calibrationbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
@@ -443,7 +443,7 @@
                     android:textSize="10sp"
                     android:visibility="gone" />
 
-                <Button
+                <info.nightscout.utils.SingleClickButton
                     android:id="@+id/overview_quickwizardbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"

app/src/main/res/layout/overview_fragment_nsclient.xml

@@ -593,7 +593,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-                <Button
+                <info.nightscout.utils.SingleClickButton
                     android:id="@+id/overview_treatmentbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
@@ -607,7 +607,7 @@
                     android:textColor="@color/colorTreatmentButton"
                     android:textSize="10sp" />
 
-                <Button
+                <info.nightscout.utils.SingleClickButton
                     android:id="@+id/overview_wizardbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
@@ -622,7 +622,7 @@
                     android:textSize="10sp"
                     android:visibility="gone" />
 
-                <Button
+                <info.nightscout.utils.SingleClickButton
                     android:id="@+id/overview_quickwizardbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"

app/src/main/res/layout/overview_fragment_nsclient_tablet.xml

@@ -691,7 +691,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-                <Button
+                <info.nightscout.utils.SingleClickButton
                     android:id="@+id/overview_treatmentbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
@@ -705,7 +705,7 @@
                     android:textColor="@color/colorTreatmentButton"
                     android:textSize="10sp" />
 
-                <Button
+                <info.nightscout.utils.SingleClickButton
                     android:id="@+id/overview_wizardbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
@@ -720,7 +720,7 @@
                     android:textSize="10sp"
                     android:visibility="gone" />
 
-                <Button
+                <info.nightscout.utils.SingleClickButton
                     android:id="@+id/overview_calibrationbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"
@@ -735,7 +735,7 @@
                     android:textSize="10sp"
                     android:visibility="gone" />
 
-                <Button
+                <info.nightscout.utils.SingleClickButton
                     android:id="@+id/overview_quickwizardbutton"
                     style="?android:attr/buttonStyle"
                     android:layout_width="0px"