Merge pull request #634 from MilosKozak/dev

1.58

.travis.yml

@@ -7,12 +7,18 @@ android:
   components:
   - platform-tools
   - tools
-  - build-tools-25.0.2
+  - build-tools-27.0.2
   - android-23
   - extra-google-m2repository
   - extra-android-m2repository
   - extra-google-google_play_services
   
+before_install:
+- yes | sdkmanager "platforms;android-27"
+
 script:
   # Unit Test
-  - ./gradlew test
+  - ./gradlew test jacocoTestReport
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash)

ISSUE_TEMPLATE.md

@@ -0,0 +1,10 @@
+Reporting bugs
+--------------
+- Note the precise time the problem occurred and describe the circumstances and steps that caused
+  the problem
+- Note the Build version (found in the About dialog in the app, when pressing the three dots in the
+  upper-right corner).
+- Obtain the app's log files, which can be found on the phone in
+  _/storage/emulated/0/Android/data/info.nightscout.androidaps/_
+  See https://github.com/MilosKozak/AndroidAPS/wiki/Accessing-logfiles
+- Open an issue at https://github.com/MilosKozak/AndroidAPS/issues/new

README.md

@@ -5,3 +5,5 @@
 
 [![Gitter](https://badges.gitter.im/MilosKozak/AndroidAPS.svg)](https://gitter.im/MilosKozak/AndroidAPS?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Build status](https://travis-ci.org/MilosKozak/AndroidAPS.svg?branch=master)](https://travis-ci.org/MilosKozak/AndroidAPS)
+[![codecov](https://codecov.io/gh/MilosKozak/AndroidAPS/branch/master/graph/badge.svg)](https://codecov.io/gh/MilosKozak/AndroidAPS)
+dev: [![codecov](https://codecov.io/gh/MilosKozak/AndroidAPS/branch/dev/graph/badge.svg)](https://codecov.io/gh/MilosKozak/AndroidAPS)

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

@@ -1,14 +1,26 @@
 buildscript {
     repositories {
         maven { url 'https://maven.fabric.io/public' }
+        jcenter()
     }
 
     dependencies {
         classpath 'io.fabric.tools:gradle:1.+'
+        classpath 'com.dicedmelon.gradle:jacoco-android:0.1.2'
     }
 }
-apply plugin: 'com.android.application'
+apply plugin: "com.android.application"
-apply plugin: 'io.fabric'
+apply plugin: "io.fabric"
+apply plugin: "jacoco-android"
+apply plugin: 'com.jakewharton.butterknife'
+
+ext {
+    supportLibraryVersion = "27.0.2"
+    ormLiteVersion = "4.46"
+    powermockVersion = "1.7.3"
+    dexmakerVersion = "1.2"
+}
+
 
 repositories {
     maven { url 'https://maven.fabric.io/public' }
@@ -36,8 +48,8 @@ def generateGitBuild = { ->
 }
 
 android {
-    compileSdkVersion 23
+    compileSdkVersion 27
-    buildToolsVersion "25.0.2"
+    buildToolsVersion "${supportLibraryVersion}"
 
     defaultConfig {
         applicationId "info.nightscout.androidaps"
@@ -45,7 +57,7 @@ android {
         targetSdkVersion 23
         multiDexEnabled true
         versionCode 1500
-        version "1.55"
+        version "1.58"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", generateGitBuild()
 
@@ -54,13 +66,24 @@ android {
         }
     }
     lintOptions {
+        // TODO remove once wear dependency com.google.android.gms:play-services-wearable:7.3.0
+        // has been upgraded (requiring significant code changes), which currently fails release
+        // build with a deprecation warning
+        //abortOnError false
+        // (disabled entirely to avoid reports on the error, which would still be displayed
+        //  and it's easy to overlook that it's ignored)
+        checkReleaseBuilds false
         disable 'MissingTranslation'
+        disable 'ExtraTranslation'
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+        debug {
+            testCoverageEnabled true
+        }
     }
     productFlavors {
         flavorDimensions "standard"
@@ -75,6 +98,8 @@ android {
             buildConfigField "boolean", "PUMPDRIVERS", "true"
             buildConfigField "boolean", "NSCLIENTOLNY", "false"
             buildConfigField "boolean", "CLOSEDLOOP", "true"
+            buildConfigField "boolean", "G5UPLOADER", "false"
+            buildConfigField "boolean", "PUMPCONTROL", "false"
         }
         openloop {
             dimension "standard"
@@ -87,6 +112,8 @@ android {
             buildConfigField "boolean", "PUMPDRIVERS", "true"
             buildConfigField "boolean", "NSCLIENTOLNY", "false"
             buildConfigField "boolean", "CLOSEDLOOP", "false"
+            buildConfigField "boolean", "G5UPLOADER", "false"
+            buildConfigField "boolean", "PUMPCONTROL", "false"
         }
         pumpcontrol {
             dimension "standard"
@@ -99,6 +126,8 @@ android {
             buildConfigField "boolean", "PUMPDRIVERS", "true"
             buildConfigField "boolean", "NSCLIENTOLNY", "false"
             buildConfigField "boolean", "CLOSEDLOOP", "false"
+            buildConfigField "boolean", "G5UPLOADER", "false"
+            buildConfigField "boolean", "PUMPCONTROL", "true"
         }
         nsclient {
             dimension "standard"
@@ -111,6 +140,22 @@ android {
             buildConfigField "boolean", "PUMPDRIVERS", "false"
             buildConfigField "boolean", "NSCLIENTOLNY", "true"
             buildConfigField "boolean", "CLOSEDLOOP", "false"
+            buildConfigField "boolean", "G5UPLOADER", "false"
+            buildConfigField "boolean", "PUMPCONTROL", "false"
+        }
+        g5uploader {
+            dimension "standard"
+            resValue "string", "app_name", "NSClient"
+            versionName version + "-nsclient"
+            manifestPlaceholders = [
+                    appIcon: "@mipmap/yellowowl"
+            ]
+            buildConfigField "boolean", "APS", "false"
+            buildConfigField "boolean", "PUMPDRIVERS", "false"
+            buildConfigField "boolean", "NSCLIENTOLNY", "false"
+            buildConfigField "boolean", "CLOSEDLOOP", "false"
+            buildConfigField "boolean", "G5UPLOADER", "true"
+            buildConfigField "boolean", "PUMPCONTROL", "false"
         }
     }
 }
@@ -128,47 +173,58 @@ dependencies {
     wearApp project(':wear')
 
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile('com.crashlytics.sdk.android:crashlytics:2.6.7@aar') {
+    compile("com.crashlytics.sdk.android:crashlytics:2.6.7@aar") {
         transitive = true;
     }
-    compile('com.crashlytics.sdk.android:answers:1.3.12@aar') {
+    compile("com.crashlytics.sdk.android:answers:1.3.12@aar") {
         transitive = true;
     }
 
-    compile 'com.android.support:appcompat-v7:23.4.0'
+    compile "com.android.support:appcompat-v7:${supportLibraryVersion}"
-    compile 'com.android.support:support-v4:23.4.0'
+    compile "com.android.support:support-v4:${supportLibraryVersion}"
-    compile 'com.android.support:cardview-v7:23.4.0'
+    compile "com.android.support:cardview-v7:${supportLibraryVersion}"
-    compile 'com.android.support:recyclerview-v7:23.4.0'
+    compile "com.android.support:recyclerview-v7:${supportLibraryVersion}"
-    compile 'com.android.support:gridlayout-v7:23.4.0'
+    compile "com.android.support:gridlayout-v7:${supportLibraryVersion}"
-    compile "com.android.support:design:23.4.0"
+    compile "com.android.support:design:${supportLibraryVersion}"
-    compile "com.android.support:percent:23.4.0"
+    compile "com.android.support:percent:${supportLibraryVersion}"
-    compile 'com.wdullaer:materialdatetimepicker:2.3.0'
+    compile "com.wdullaer:materialdatetimepicker:2.3.0"
-    compile 'com.squareup:otto:1.3.7'
+    compile "com.squareup:otto:1.3.7"
-    compile 'com.j256.ormlite:ormlite-core:4.46'
+    compile "com.j256.ormlite:ormlite-core:${ormLiteVersion}"
-    compile 'com.j256.ormlite:ormlite-android:4.46'
+    compile "com.j256.ormlite:ormlite-android:${ormLiteVersion}"
-    compile('com.github.tony19:logback-android-classic:1.1.1-6') {
+    compile("com.github.tony19:logback-android-classic:1.1.1-6") {
-        exclude group: 'com.google.android', module: 'android'
+        exclude group: "com.google.android", module: "android"
     }
-    compile 'org.apache.commons:commons-lang3:3.6'
+    compile "org.apache.commons:commons-lang3:3.6"
-    compile 'org.slf4j:slf4j-api:1.7.12'
+    compile "org.slf4j:slf4j-api:1.7.12"
-    compile 'com.jjoe64:graphview:4.0.1'
+    compile "com.jjoe64:graphview:4.0.1"
-    compile 'com.joanzapata.iconify:android-iconify-fontawesome:2.1.1'
+    compile "com.joanzapata.iconify:android-iconify-fontawesome:2.1.1"
-    compile 'com.google.android.gms:play-services-wearable:7.5.0'
+    compile "com.google.android.gms:play-services-wearable:7.5.0"
-    compile 'junit:junit:4.12'
+    compile(name: "android-edittext-validator-v1.3.4-mod", ext: "aar")
-    testCompile 'org.json:json:20140107'
+    compile("com.google.android:flexbox:0.3.0") {
-    testCompile 'org.mockito:mockito-core:2.7.22'
+        exclude group: "com.android.support"
-    androidTestCompile 'org.mockito:mockito-core:2.7.22'
-    androidTestCompile 'com.google.dexmaker:dexmaker:1.2'
-    androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2'
-    compile(name: 'android-edittext-validator-v1.3.4-mod', ext: 'aar')
-    compile ('com.google.android:flexbox:0.3.0') {
-        exclude group: 'com.android.support'
     }
-    compile('io.socket:socket.io-client:0.8.3') {
+    compile("io.socket:socket.io-client:0.8.3") {
         // excluding org.json which is provided by Android
-        exclude group: 'org.json', module: 'json'
+        exclude group: "org.json", module: "json"
     }
-    compile 'com.google.code.gson:gson:2.7'
+    compile "com.google.code.gson:gson:2.7"
-    compile 'com.google.guava:guava:20.0'
+    compile "com.google.guava:guava:20.0"
 
+    compile "net.danlew:android.joda:2.9.9.1"
+
+    api "com.jakewharton:butterknife:8.8.1"
+    annotationProcessor "com.jakewharton:butterknife-compiler:8.8.1"
+
+    testCompile "junit:junit:4.12"
+    testCompile "org.json:json:20140107"
+    testCompile "org.mockito:mockito-core:2.7.22"
+    testCompile "org.powermock:powermock-api-mockito2:${powermockVersion}"
+    testCompile "org.powermock:powermock-module-junit4-rule-agent:${powermockVersion}"
+    testCompile "org.powermock:powermock-module-junit4-rule:${powermockVersion}"
+    testCompile "org.powermock:powermock-module-junit4:${powermockVersion}"
+    testCompile "joda-time:joda-time:2.9.4.2"
+
+    androidTestCompile "org.mockito:mockito-core:2.7.22"
+    androidTestCompile "com.google.dexmaker:dexmaker:${dexmakerVersion}"
+    androidTestCompile "com.google.dexmaker:dexmaker-mockito:${dexmakerVersion}"
 }

app/src/main/AndroidManifest.xml

@@ -42,6 +42,9 @@
         <activity
             android:name=".plugins.Overview.Dialogs.BolusProgressHelperActivity"
             android:theme="@style/Theme.AppCompat.Translucent" />
+        <activity
+            android:name=".plugins.Overview.Dialogs.ErrorHelperActivity"
+            android:theme="@style/Theme.AppCompat.Translucent" />
         <activity android:name=".AgreementActivity" />
         <activity android:name=".plugins.PumpDanaR.activities.DanaRHistoryActivity" />
         <activity android:name=".plugins.PumpDanaR.activities.DanaRStatsActivity" />
@@ -72,6 +75,8 @@
                 <action android:name="com.eveningoutpost.dexdrip.NS_EMULATOR" />
                 <!-- Receiver from glimp -->
                 <action android:name="it.ct.glicemia.ACTION_GLUCOSE_MEASURED" />
+                <!-- Receiver from DexcomG5 -->
+                <action android:name="com.dexcom.cgm.DATA" />
             </intent-filter>
         </receiver>
         <!-- Receiver keepalive, scheduled every 30 min -->
@@ -140,6 +145,9 @@
             android:name=".Services.AlarmSoundService"
             android:enabled="true"
             android:exported="true" />
+        <service
+            android:name=".plugins.Overview.notifications.DismissNotificationService"
+            android:exported="false"></service>
 
         <meta-data
             android:name="io.fabric.ApiKey"

app/src/main/assets/logback.xml

@@ -15,7 +15,7 @@
             <maxHistory>120</maxHistory>
 	</rollingPolicy>
     <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level [%file:%line]: %msg%n</pattern>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level [%class:%line]: %msg%n</pattern>
     </encoder>
   </appender>
 
@@ -24,7 +24,7 @@
 		  <pattern>%logger{0}</pattern>
 	  </tagEncoder>
     <encoder>
-      <pattern>[%thread] %-5level [%file:%line]: %msg%n</pattern>
+      <pattern>[%thread] %-5level [%class:%line]: %msg%n</pattern>
     </encoder>
   </appender>
   

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

@@ -4,22 +4,24 @@ package info.nightscout.androidaps;
  * Created by mike on 07.06.2016.
  */
 public class Config {
-    public static int SUPPORTEDNSVERSION = 1000; // 0.10.00
+    public static int SUPPORTEDNSVERSION = 1002; // 0.10.00
 
     // MAIN FUCTIONALITY
     public static final boolean APS = BuildConfig.APS;
     // PLUGINS
     public static final boolean NSCLIENT = BuildConfig.NSCLIENTOLNY;
+    public static final boolean G5UPLOADER = BuildConfig.G5UPLOADER;
+    public static final boolean PUMPCONTROL = BuildConfig.PUMPCONTROL;
 
-    public static final boolean DANAR = true && BuildConfig.PUMPDRIVERS;
+    public static final boolean DANAR = BuildConfig.PUMPDRIVERS;
 
-    public static final boolean ACTION = !BuildConfig.NSCLIENTOLNY;
+    public static final boolean ACTION = !BuildConfig.NSCLIENTOLNY && !BuildConfig.G5UPLOADER;
-    public static final boolean VIRTUALPUMP = !BuildConfig.NSCLIENTOLNY;
+    public static final boolean VIRTUALPUMP = !BuildConfig.NSCLIENTOLNY && !BuildConfig.G5UPLOADER;
-    public static final boolean MDI = !BuildConfig.NSCLIENTOLNY;
+    public static final boolean MDI = !BuildConfig.NSCLIENTOLNY && !BuildConfig.G5UPLOADER;
-    public static final boolean OTHERPROFILES = !BuildConfig.NSCLIENTOLNY;
+    public static final boolean OTHERPROFILES = !BuildConfig.NSCLIENTOLNY && !BuildConfig.G5UPLOADER;
-    public static final boolean SAFETY = !BuildConfig.NSCLIENTOLNY;
+    public static final boolean SAFETY = !BuildConfig.NSCLIENTOLNY && !BuildConfig.G5UPLOADER;
 
-    public static final boolean SMSCOMMUNICATORENABLED = !BuildConfig.NSCLIENTOLNY;
+    public static final boolean SMSCOMMUNICATORENABLED = !BuildConfig.NSCLIENTOLNY && !BuildConfig.G5UPLOADER;
 
 
     public static final boolean detailedLog = true;

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

@@ -54,8 +54,12 @@ public class Constants {
 
     //Screen: Threshold for width/height to go into small width/height layout
     public static final int SMALL_WIDTH = 320;
-    public static final int SMALL_HEIGHT = 320;
+    public static final int SMALL_HEIGHT = 480;
 
     //Autosens
     public static final double DEVIATION_TO_BE_EQUAL = 2.0;
+
+    // Pump
+    public static final int PUMP_MAX_CONNECTION_TIME_IN_SECONDS = 120 - 1;
+    public static final int MIN_WATCHDOG_INTERVAL_IN_SECONDS = 12 * 60;
 }

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

@@ -82,7 +82,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
                     Manifest.permission.WRITE_EXTERNAL_STORAGE}, CASE_STORAGE);
         }
         askForBatteryOptimizationPermission();
-        checkUpgradeToProfileTarget();
+        doMigrations();
         if (Config.logFunctionCalls)
             log.debug("onCreate");
 
@@ -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);
@@ -159,6 +163,19 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         }
     }
 
+    private void doMigrations() {
+
+        checkUpgradeToProfileTarget();
+
+        // guarantee that the unreachable threshold is at least 30 and of type String
+        // Added in 1.57 at 21.01.2018
+        Integer unreachable_threshold = SP.getInt(R.string.key_pump_unreachable_threshold, 30);
+        SP.remove(R.string.key_pump_unreachable_threshold);
+        if(unreachable_threshold < 30) unreachable_threshold = 30;
+        SP.putString(R.string.key_pump_unreachable_threshold, unreachable_threshold.toString());
+    }
+
+
     private void checkUpgradeToProfileTarget() { // TODO: can be removed in the future
         boolean oldKeyExists = SP.contains("openapsma_min_bg");
         if (oldKeyExists) {
@@ -369,7 +386,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
                             case R.id.nav_about:
                                 AlertDialog.Builder builder = new AlertDialog.Builder(v.getContext());
                                 builder.setTitle(getString(R.string.app_name) + " " + BuildConfig.VERSION);
-                                if (Config.NSCLIENT)
+                                if (Config.NSCLIENT|| Config.G5UPLOADER)
                                     builder.setIcon(R.mipmap.yellowowl);
                                 else
                                     builder.setIcon(R.mipmap.blueowl);

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

@@ -1,7 +1,6 @@
 package info.nightscout.androidaps;
 
 import android.app.Application;
-import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.Resources;
 import android.os.SystemClock;
@@ -16,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;
 
@@ -25,7 +26,6 @@ import info.nightscout.androidaps.Services.Intents;
 import info.nightscout.androidaps.db.DatabaseHelper;
 import info.nightscout.androidaps.interfaces.InsulinInterface;
 import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.Actions.ActionsFragment;
 import info.nightscout.androidaps.plugins.Careportal.CareportalPlugin;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderFragment;
@@ -47,23 +47,20 @@ import info.nightscout.androidaps.plugins.OpenAPSMA.OpenAPSMAPlugin;
 import info.nightscout.androidaps.plugins.Overview.OverviewPlugin;
 import info.nightscout.androidaps.plugins.Persistentnotification.PersistentNotificationPlugin;
 import info.nightscout.androidaps.plugins.ProfileCircadianPercentage.CircadianPercentageProfileFragment;
-import info.nightscout.androidaps.plugins.ProfileLocal.LocalProfileFragment;
+import info.nightscout.androidaps.plugins.ProfileLocal.LocalProfilePlugin;
 import info.nightscout.androidaps.plugins.ProfileNS.NSProfilePlugin;
 import info.nightscout.androidaps.plugins.ProfileSimple.SimpleProfilePlugin;
 import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaR.services.DanaRExecutionService;
 import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaRKorean.services.DanaRKoreanExecutionService;
 import info.nightscout.androidaps.plugins.PumpDanaRS.DanaRSPlugin;
-import info.nightscout.androidaps.plugins.PumpDanaRS.services.DanaRSService;
 import info.nightscout.androidaps.plugins.PumpDanaRv2.DanaRv2Plugin;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.services.DanaRv2ExecutionService;
 import info.nightscout.androidaps.plugins.PumpMDI.MDIPlugin;
 import info.nightscout.androidaps.plugins.PumpVirtual.VirtualPumpPlugin;
 import info.nightscout.androidaps.plugins.SensitivityAAPS.SensitivityAAPSPlugin;
 import info.nightscout.androidaps.plugins.SensitivityOref0.SensitivityOref0Plugin;
 import info.nightscout.androidaps.plugins.SensitivityWeightedAverage.SensitivityWeightedAveragePlugin;
 import info.nightscout.androidaps.plugins.SmsCommunicator.SmsCommunicatorPlugin;
+import info.nightscout.androidaps.plugins.SourceDexcomG5.SourceDexcomG5Plugin;
 import info.nightscout.androidaps.plugins.SourceGlimp.SourceGlimpPlugin;
 import info.nightscout.androidaps.plugins.SourceMM640g.SourceMM640gPlugin;
 import info.nightscout.androidaps.plugins.SourceNSClient.SourceNSClientPlugin;
@@ -101,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);
@@ -129,7 +127,7 @@ public class MainApp extends Application {
             if (Config.DANAR) pluginsList.add(DanaRPlugin.getPlugin());
             if (Config.DANAR) pluginsList.add(DanaRKoreanPlugin.getPlugin());
             if (Config.DANAR) pluginsList.add(DanaRv2Plugin.getPlugin());
-            //if (Config.DANAR) pluginsList.add(DanaRSPlugin.getPlugin());
+            if (Config.DANAR) pluginsList.add(DanaRSPlugin.getPlugin());
             pluginsList.add(CareportalPlugin.getPlugin());
             if (Config.MDI) pluginsList.add(MDIPlugin.getPlugin());
             if (Config.VIRTUALPUMP) pluginsList.add(VirtualPumpPlugin.getPlugin());
@@ -138,19 +136,22 @@ public class MainApp extends Application {
             if (Config.APS) pluginsList.add(OpenAPSAMAPlugin.getPlugin());
             pluginsList.add(NSProfilePlugin.getPlugin());
             if (Config.OTHERPROFILES) pluginsList.add(SimpleProfilePlugin.getPlugin());
-            if (Config.OTHERPROFILES) pluginsList.add(LocalProfileFragment.getPlugin());
+            if (Config.OTHERPROFILES) pluginsList.add(LocalProfilePlugin.getPlugin());
             if (Config.OTHERPROFILES)
                 pluginsList.add(CircadianPercentageProfileFragment.getPlugin());
             pluginsList.add(TreatmentsPlugin.getPlugin());
             if (Config.SAFETY) pluginsList.add(SafetyPlugin.getPlugin());
             if (Config.APS) pluginsList.add(ObjectivesPlugin.getPlugin());
-            if (!Config.NSCLIENT)
+            if (!Config.NSCLIENT && !Config.G5UPLOADER)
                 pluginsList.add(SourceXdripPlugin.getPlugin());
+            if (!Config.G5UPLOADER)
                 pluginsList.add(SourceNSClientPlugin.getPlugin());
-            if (!Config.NSCLIENT)
+            if (!Config.NSCLIENT && !Config.G5UPLOADER)
                 pluginsList.add(SourceMM640gPlugin.getPlugin());
-            if (!Config.NSCLIENT)
+            if (!Config.NSCLIENT && !Config.G5UPLOADER)
                 pluginsList.add(SourceGlimpPlugin.getPlugin());
+            if (!Config.NSCLIENT)
+                pluginsList.add(SourceDexcomG5Plugin.getPlugin());
             if (Config.SMSCOMMUNICATORENABLED) pluginsList.add(SmsCommunicatorPlugin.getPlugin());
             pluginsList.add(FoodPlugin.getPlugin());
 
@@ -164,22 +165,25 @@ public class MainApp extends Application {
             MainApp.getConfigBuilder().initialize();
         }
         NSUpload.uploadAppStart();
-        if (MainApp.getConfigBuilder().isClosedModeEnabled())
+        if (Config.NSCLIENT)
+            Answers.getInstance().logCustom(new CustomEvent("AppStart-NSClient"));
+        else if (Config.G5UPLOADER)
+            Answers.getInstance().logCustom(new CustomEvent("AppStart-G5Uploader"));
+        else if (Config.PUMPCONTROL)
+            Answers.getInstance().logCustom(new CustomEvent("AppStart-PumpControl"));
+        else if (MainApp.getConfigBuilder().isClosedModeEnabled())
             Answers.getInstance().logCustom(new CustomEvent("AppStart-ClosedLoop"));
         else
-            Answers.getInstance().logCustom(new CustomEvent("AppStart"));
+            Answers.getInstance().logCustom(new CustomEvent("AppStart-OpenLoop"));
 
-        Thread t = new Thread(new Runnable() {
+        new Thread(new Runnable() {
             @Override
             public void run() {
                 SystemClock.sleep(5000);
-                PumpInterface pump = MainApp.getConfigBuilder();
+                ConfigBuilderPlugin.getCommandQueue().readStatus("Initialization", null);
-                if (pump != null)
-                    pump.refreshDataFromPump("Initialization");
                 startKeepAliveService();
             }
-        }, "pump-initialization");
+        }).start();
-        t.start();
 
     }
 
@@ -218,13 +222,21 @@ public class MainApp extends Application {
 
     public void stopKeepAliveService() {
         if (keepAliveReceiver != null)
-            keepAliveReceiver.cancelAlarm(this);
+            KeepAliveReceiver.cancelAlarm(this);
     }
 
     public static Bus bus() {
         return sBus;
     }
 
+    public static String gs(int id) {
+        return sResources.getString(id);
+    }
+
+    public static String gs(int id, Object... args) {
+        return sResources.getString(id, args);
+    }
+
     public static MainApp instance() {
         return sInstance;
     }

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;
@@ -31,6 +32,7 @@ import info.nightscout.androidaps.plugins.SensitivityAAPS.SensitivityAAPSPlugin;
 import info.nightscout.androidaps.plugins.SensitivityOref0.SensitivityOref0Plugin;
 import info.nightscout.androidaps.plugins.SensitivityWeightedAverage.SensitivityWeightedAveragePlugin;
 import info.nightscout.androidaps.plugins.SmsCommunicator.SmsCommunicatorPlugin;
+import info.nightscout.androidaps.plugins.SourceDexcomG5.SourceDexcomG5Plugin;
 import info.nightscout.androidaps.plugins.Wear.WearPlugin;
 import info.nightscout.androidaps.plugins.XDripStatusline.StatuslinePlugin;
 import info.nightscout.utils.LocaleHelper;
@@ -57,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(true));
-            MainApp.bus().post(new EventRefreshGui());
+            //recreate() does not update language so better close settings
+            finish();
         }
         if (key.equals("short_tabtitles")) {
             MainApp.bus().post(new EventRefreshGui());
@@ -126,15 +129,16 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
                 addPreferencesFromResource(id);
                 addPreferencesFromResource(R.xml.pref_advanced);
             } else {
-                if (!Config.NSCLIENT) {
+                if (!Config.NSCLIENT && !Config.G5UPLOADER) {
                     addPreferencesFromResource(R.xml.pref_password);
                 }
                 addPreferencesFromResource(R.xml.pref_age);
                 addPreferencesFromResource(R.xml.pref_language);
 
-                if (!Config.NSCLIENT) {
+                if (!Config.NSCLIENT && !Config.G5UPLOADER) {
                     addPreferencesFromResource(R.xml.pref_quickwizard);
                 }
+                addPreferencesFromResourceIfEnabled(SourceDexcomG5Plugin.getPlugin(), PluginBase.BGSOURCE);
                 addPreferencesFromResourceIfEnabled(CareportalPlugin.getPlugin(), PluginBase.GENERAL);
                 addPreferencesFromResourceIfEnabled(SafetyPlugin.getPlugin(), PluginBase.CONSTRAINTS);
                 if (Config.APS) {
@@ -147,10 +151,6 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
                 addPreferencesFromResourceIfEnabled(SensitivityWeightedAveragePlugin.getPlugin(), PluginBase.SENSITIVITY);
                 addPreferencesFromResourceIfEnabled(SensitivityOref0Plugin.getPlugin(), PluginBase.SENSITIVITY);
 
-                if (!Config.NSCLIENT) {
-                    addPreferencesFromResource(R.xml.pref_profile);
-                }
-
                 if (Config.DANAR) {
                     addPreferencesFromResourceIfEnabled(DanaRPlugin.getPlugin(), PluginBase.PUMP);
                     addPreferencesFromResourceIfEnabled(DanaRKoreanPlugin.getPlugin(), PluginBase.PUMP);
@@ -165,14 +165,16 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
                     }
                 }
 
+                if (!Config.NSCLIENT && !Config.G5UPLOADER) {
                     addPreferencesFromResourceIfEnabled(VirtualPumpPlugin.getPlugin(), PluginBase.PUMP);
+                }
 
                 addPreferencesFromResourceIfEnabled(InsulinOrefFreePeakPlugin.getPlugin(), PluginBase.INSULIN);
 
                 addPreferencesFromResourceIfEnabled(NSClientInternalPlugin.getPlugin(), PluginBase.GENERAL);
                 addPreferencesFromResourceIfEnabled(SmsCommunicatorPlugin.getPlugin(), PluginBase.GENERAL);
 
-                if (!Config.NSCLIENT) {
+                if (!Config.NSCLIENT && !Config.G5UPLOADER) {
                     addPreferencesFromResource(R.xml.pref_others);
                 }
                 addPreferencesFromResource(R.xml.pref_advanced);

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

@@ -15,29 +15,32 @@ import org.slf4j.LoggerFactory;
 import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.data.ProfileStore;
 import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.events.EventNewBasalProfile;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.ConstraintsObjectives.ObjectivesPlugin;
+import info.nightscout.androidaps.plugins.NSClientInternal.data.NSDeviceStatus;
 import info.nightscout.androidaps.plugins.NSClientInternal.data.NSMbg;
-import info.nightscout.androidaps.plugins.NSClientInternal.data.NSSgv;
-import info.nightscout.androidaps.data.ProfileStore;
 import info.nightscout.androidaps.plugins.NSClientInternal.data.NSSettingsStatus;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.NSClientInternal.data.NSSgv;
 import info.nightscout.androidaps.plugins.Overview.OverviewPlugin;
 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.androidaps.plugins.ProfileNS.NSProfilePlugin;
+import info.nightscout.androidaps.plugins.ProfileNS.events.EventNSProfileUpdateGUI;
 import info.nightscout.androidaps.plugins.PumpDanaR.activities.DanaRNSHistorySync;
 import info.nightscout.androidaps.plugins.SmsCommunicator.events.EventNewSMS;
+import info.nightscout.androidaps.plugins.SourceDexcomG5.SourceDexcomG5Plugin;
 import info.nightscout.androidaps.plugins.SourceGlimp.SourceGlimpPlugin;
 import info.nightscout.androidaps.plugins.SourceMM640g.SourceMM640gPlugin;
 import info.nightscout.androidaps.plugins.SourceNSClient.SourceNSClientPlugin;
 import info.nightscout.androidaps.plugins.SourceXdrip.SourceXdripPlugin;
 import info.nightscout.androidaps.receivers.DataReceiver;
-import info.nightscout.androidaps.plugins.NSClientInternal.data.NSDeviceStatus;
 import info.nightscout.utils.BundleLogger;
+import info.nightscout.utils.NSUpload;
 import info.nightscout.utils.SP;
 
 
@@ -48,6 +51,7 @@ public class DataService extends IntentService {
     boolean nsClientEnabled = true;
     boolean mm640gEnabled = false;
     boolean glimpEnabled = false;
+    boolean dexcomG5Enabled = false;
 
     public DataService() {
         super("DataService");
@@ -64,26 +68,41 @@ public class DataService extends IntentService {
             nsClientEnabled = false;
             mm640gEnabled = false;
             glimpEnabled = false;
+            dexcomG5Enabled = false;
         } else if (ConfigBuilderPlugin.getActiveBgSource().getClass().equals(SourceNSClientPlugin.class)) {
             xDripEnabled = false;
             nsClientEnabled = true;
             mm640gEnabled = false;
             glimpEnabled = false;
+            dexcomG5Enabled = false;
         } else if (ConfigBuilderPlugin.getActiveBgSource().getClass().equals(SourceMM640gPlugin.class)) {
             xDripEnabled = false;
             nsClientEnabled = false;
             mm640gEnabled = true;
             glimpEnabled = false;
+            dexcomG5Enabled = false;
         } else if (ConfigBuilderPlugin.getActiveBgSource().getClass().equals(SourceGlimpPlugin.class)) {
             xDripEnabled = false;
             nsClientEnabled = false;
             mm640gEnabled = false;
             glimpEnabled = true;
+            dexcomG5Enabled = false;
+        } else if (ConfigBuilderPlugin.getActiveBgSource().getClass().equals(SourceDexcomG5Plugin.class)) {
+            xDripEnabled = false;
+            nsClientEnabled = false;
+            mm640gEnabled = false;
+            glimpEnabled = false;
+            dexcomG5Enabled = true;
         }
 
         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();
@@ -99,18 +118,20 @@ public class DataService extends IntentService {
                 if (glimpEnabled) {
                     handleNewDataFromGlimp(intent);
                 }
-            } else if (Intents.ACTION_NEW_SGV.equals(action)) {
+            } else if (Intents.DEXCOMG5_BG.equals(action)) {
-                // always handle SGV if NS-Client is the source
+                if (dexcomG5Enabled) {
-                if (nsClientEnabled) {
+                    handleNewDataFromDexcomG5(intent);
-                    handleNewDataFromNSClient(intent);
                 }
+            } else if (Intents.ACTION_NEW_SGV.equals(action)) {
+                // 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) ||
@@ -187,6 +208,40 @@ public class DataService extends IntentService {
         MainApp.getDbHelper().createIfNotExists(bgReading, "GLIMP");
     }
 
+    private void handleNewDataFromDexcomG5(Intent intent) {
+        // onHandleIntent Bundle{ data => [{"m_time":1511939180,"m_trend":"NotComputable","m_value":335}]; android.support.content.wakelockid => 95; }Bundle
+
+        Bundle bundle = intent.getExtras();
+        if (bundle == null) return;
+
+        BgReading bgReading = new BgReading();
+
+        String data = bundle.getString("data");
+        log.debug("Received Dexcom Data", data);
+
+        try {
+            JSONArray jsonArray = new JSONArray(data);
+            log.debug("Received Dexcom Data size:" + jsonArray.length());
+            for(int i = 0; i < jsonArray.length(); i++) {
+                JSONObject json = jsonArray.getJSONObject(i);
+                bgReading.value = json.getInt("m_value");
+                bgReading.direction = json.getString("m_trend");
+                bgReading.date = json.getLong("m_time") * 1000L;
+                bgReading.raw = 0;
+                boolean isNew = MainApp.getDbHelper().createIfNotExists(bgReading, "DexcomG5");
+                if (isNew && SP.getBoolean(R.string.key_dexcomg5_nsupload, false)) {
+                    NSUpload.uploadBg(bgReading);
+                }
+                if (isNew && SP.getBoolean(R.string.key_dexcomg5_xdripupload, false)) {
+                    NSUpload.sendToXdrip(bgReading);
+                }
+            }
+
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
+
     private void handleNewDataFromMM640g(Intent intent) {
         Bundle bundle = intent.getExtras();
         if (bundle == null) return;
@@ -250,7 +305,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));
@@ -311,8 +366,10 @@ public class DataService extends IntentService {
                 String profile = bundles.getString("profile");
                 ProfileStore profileStore = new ProfileStore(new JSONObject(profile));
                 NSProfilePlugin.storeNewProfile(profileStore);
+                MainApp.bus().post(new EventNSProfileUpdateGUI());
+                // if there are no profile switches this should lead to profile update
+                if (MainApp.getConfigBuilder().getProfileSwitchesFromHistory().size() == 0)
                     MainApp.bus().post(new EventNewBasalProfile());
-
                 if (Config.logIncommingData)
                     log.debug("Received profileStore: " + activeProfile + " " + profile);
             } catch (JSONException e) {

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

@@ -45,4 +45,6 @@ public interface Intents {
     String ACTION_REMOTE_CALIBRATION = "com.eveningoutpost.dexdrip.NewCalibration";
 
     String GLIMP_BG = "it.ct.glicemia.ACTION_GLUCOSE_MEASURED";
+
+    String DEXCOMG5_BG = "com.dexcom.cgm.DATA";
 }

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/Iob.java

@@ -12,4 +12,26 @@ public class Iob {
         activityContrib += iob.activityContrib;
         return this;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        Iob iob = (Iob) o;
+
+        if (Double.compare(iob.iobContrib, iobContrib) != 0) return false;
+        return Double.compare(iob.activityContrib, activityContrib) == 0;
+    }
+
+    @Override
+    public int hashCode() {
+        int result;
+        long temp;
+        temp = Double.doubleToLongBits(iobContrib);
+        result = (int) (temp ^ (temp >>> 32));
+        temp = Double.doubleToLongBits(activityContrib);
+        result = 31 * result + (int) (temp ^ (temp >>> 32));
+        return result;
+    }
 }

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

@@ -12,17 +12,19 @@ import org.slf4j.LoggerFactory;
 
 import java.text.DecimalFormat;
 import java.util.Calendar;
-import java.util.Date;
 import java.util.TimeZone;
 
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.interfaces.PumpDescription;
+import info.nightscout.androidaps.interfaces.PumpInterface;
+import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Overview.events.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.DecimalFormatter;
-import info.nightscout.utils.SafeParse;
 import info.nightscout.utils.ToastUtils;
 
 public class Profile {
@@ -46,6 +48,9 @@ public class Profile {
     private int percentage = 100;
     private int timeshift = 0;
 
+    private boolean isValid = true;
+    private boolean isValidated = false;
+
     public Profile(JSONObject json, String units) {
         this(json, 100, 0);
         if (this.units == null) {
@@ -118,7 +123,9 @@ public class Profile {
             }
         } catch (JSONException e) {
             log.error("Unhandled exception", e);
-            ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.sResources.getString(R.string.invalidprofile));
+            ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.gs(R.string.invalidprofile));
+            isValid = false;
+            isValidated = true;
         }
     }
 
@@ -161,12 +168,20 @@ public class Profile {
         LongSparseArray<Double> sparse = new LongSparseArray<>();
         for (Integer index = 0; index < array.length(); index++) {
             try {
-                JSONObject o = array.getJSONObject(index);
+                final JSONObject o = array.getJSONObject(index);
-                long tas = getShitfTimeSecs((int) o.getLong("timeAsSeconds"));
+                long tas = 0;
-                Double value = o.getDouble("value") * multiplier;
+                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);
             } catch (JSONException e) {
                 log.error("Unhandled exception", e);
+                log.error(json.toString());
             }
         }
 
@@ -178,6 +193,72 @@ public class Profile {
         return sparse;
     }
 
+    public synchronized boolean isValid(String from) {
+        if (!isValid)
+            return false;
+        if (!isValidated) {
+            if (basal_v == null)
+                basal_v = convertToSparseArray(basal);
+            validate(basal_v);
+            if (isf_v == null)
+                isf_v = convertToSparseArray(isf);
+            validate(isf_v);
+            if (ic_v == null)
+                ic_v = convertToSparseArray(ic);
+            validate(ic_v);
+            if (targetLow_v == null)
+                targetLow_v = convertToSparseArray(targetLow);
+            validate(targetLow_v);
+            if (targetHigh_v == null)
+                targetHigh_v = convertToSparseArray(targetHigh);
+            validate(targetHigh_v);
+            isValidated = true;
+        }
+
+        if (isValid) {
+            // Check for hours alignment
+            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, String.format(MainApp.gs(R.string.basalprofilenotaligned), from), Notification.NORMAL);
+                    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,  String.format(MainApp.gs(R.string.minimalbasalvaluereplaced), from), Notification.NORMAL)));
+                    }
+                }
+            } else {
+                // if pump not available (at start)
+                // do not store converted array
+                basal_v = null;
+                isValidated = false;
+            }
+
+         }
+        return isValid;
+    }
+
+    private void validate(LongSparseArray array) {
+        if (array.size() == 0) {
+            isValid = false;
+            return;
+        }
+        for (int index = 0; index < array.size(); index++) {
+            if (array.valueAt(index).equals(0d)) {
+                isValid = false;
+                return;
+            }
+        }
+    }
+
     private Double getValueToTime(JSONArray array, Integer timeAsSeconds) {
         Double lastValue = null;
 
@@ -324,9 +405,10 @@ public class Profile {
         return getBasal(secondsFromMidnight(time));
     }
 
-    public Double getBasal(Integer timeAsSeconds) {
+    public synchronized Double getBasal(Integer timeAsSeconds) {
-        if (basal_v == null)
+        if (basal_v == null) {
             basal_v = convertToSparseArray(basal);
+        }
         return getValueToTime(basal_v, timeAsSeconds);
     }
 
@@ -344,7 +426,9 @@ public class Profile {
         public Double value;
     }
 
-    public BasalValue[] getBasalValues() {
+    public synchronized BasalValue[] getBasalValues() {
+        if (basal_v == null)
+            basal_v = convertToSparseArray(basal);
         BasalValue[] ret = new BasalValue[basal_v.size()];
 
         for (Integer index = 0; index < basal_v.size(); index++) {

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

@@ -31,6 +31,7 @@ public class ProfileIntervals<T extends Interval> {
 
     public synchronized void add(List<T> list) {
         for (T interval : list) {
+            if (interval.isValid())
                 rawData.put(interval.start(), interval);
         }
         merge();

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 {
+    private JSONArray storage = new JSONArray();
-        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();
 
     public void setData(JSONArray newData) {
         storage = newData;

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

@@ -0,0 +1,247 @@
+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, boolean _synchronized) {
+        BolusWizard wizard = new BolusWizard();
+
+        //BG
+        double bg = 0;
+        if (lastBG != null && useBG() == YES) {
+            bg = lastBG.valueToUnits(profile.getUnits());
+        }
+
+        // COB
+        double cob = 0d;
+        AutosensData autosensData;
+        if (_synchronized)
+            autosensData = IobCobCalculatorPlugin.getLastAutosensDataSynchronized("QuickWizard COB");
+        else
+            autosensData = IobCobCalculatorPlugin.getLastAutosensData("QuickWizard COB");
+
+        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) {
@@ -96,7 +97,9 @@ public class BgReading implements DataPointWithLabelInterface {
                 direction.compareTo("NOT COMPUTABLE") == 0 ||
                 direction.compareTo("OUT_OF_RANGE") == 0 ||
                 direction.compareTo("OUT OF RANGE") == 0 ||
-                direction.compareTo("NONE") == 0) {
+                direction.compareTo("NONE") == 0 ||
+                direction.compareTo("NotComputable") == 0
+                ) {
             return true;
         } else {
             return false;

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

@@ -191,6 +191,17 @@ public class CareportalEvent implements DataPointWithLabelInterface {
         return Translator.translate(eventType);
     }
 
+    public String getNotes() {
+        try {
+            JSONObject object = new JSONObject(json);
+            if (object.has("notes"))
+                return object.getString("notes");
+        } catch (JSONException e) {
+            log.error("Unhandled exception", e);
+        }
+        return "";
+    }
+
     @Override
     public long getDuration() {
         try {

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,15 @@ 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.DateUtil;
+import info.nightscout.utils.NSUpload;
+import info.nightscout.utils.PercentageSplitter;
 
 public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
     private static Logger log = LoggerFactory.getLogger(DatabaseHelper.class);
@@ -343,7 +351,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
     }
     // -------------------  BgReading handling -----------------------
 
-    public void createIfNotExists(BgReading bgReading, String from) {
+    public boolean createIfNotExists(BgReading bgReading, String from) {
         try {
             bgReading.date = roundDateToSec(bgReading.date);
             BgReading old = getDaoBgReadings().queryForId(bgReading.date);
@@ -351,18 +359,29 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 getDaoBgReadings().create(bgReading);
                 log.debug("BG: New record from: " + from + " " + bgReading.toString());
                 scheduleBgChange();
-                return;
+                return true;
             }
             if (!old.isEqual(bgReading)) {
+                log.debug("BG: Similiar found: " + old.toString());
                 old.copyFrom(bgReading);
                 getDaoBgReadings().update(old);
-                log.debug("BG: Updating record from: " + from + " " + old.toString());
+                log.debug("BG: Updating record from: " + from + " New data: " + old.toString());
                 scheduleBgChange();
-                return;
+                return false;
             }
         } catch (SQLException e) {
             log.error("Unhandled exception", e);
         }
+        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() {
@@ -395,7 +414,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);
 
@@ -433,7 +452,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;
@@ -471,7 +507,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         return 0;
     }
 
-    public int deleteDbRequestbyMongoId(String action, String id) {
+    public void deleteDbRequestbyMongoId(String action, String id) {
         try {
             QueryBuilder<DbRequest, String> queryBuilder = getDaoDbRequest().queryBuilder();
             Where where = queryBuilder.where();
@@ -479,16 +515,13 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             queryBuilder.limit(10L);
             PreparedQuery<DbRequest> preparedQuery = queryBuilder.prepare();
             List<DbRequest> dbList = getDaoDbRequest().query(preparedQuery);
-            if (dbList.size() != 1) {
             log.error("deleteDbRequestbyMongoId query size: " + dbList.size());
-            } else {
+            for (DbRequest r : dbList) {
-                //log.debug("Treatment findTreatmentById found: " + trList.get(0).log());
+                delete(r);
-                return delete(dbList.get(0));
             }
         } catch (SQLException e) {
             log.error("Unhandled exception", e);
         }
-        return 0;
     }
 
     public void deleteAllDbRequests() {
@@ -1351,7 +1384,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 return;
             }
             extendedBolus.date = trJson.getLong("mills");
-            extendedBolus.durationInMinutes = trJson.getInt("duration");
+            extendedBolus.durationInMinutes = trJson.has("duration") ? trJson.getInt("duration") : 0;
             extendedBolus.insulin = trJson.getDouble("relative");
             extendedBolus._id = trJson.getString("_id");
             createOrUpdate(extendedBolus);
@@ -1437,7 +1470,21 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         } catch (SQLException e) {
             log.error("Unhandled exception", e);
         }
-        return new ArrayList<CareportalEvent>();
+        return new ArrayList<>();
+    }
+
+    public List<CareportalEvent> getCareportalEventsFromTime(boolean ascending) {
+        try {
+            List<CareportalEvent> careportalEvents;
+            QueryBuilder<CareportalEvent, Long> queryBuilder = getDaoCareportalEvents().queryBuilder();
+            queryBuilder.orderBy("date", ascending);
+            PreparedQuery<CareportalEvent> preparedQuery = queryBuilder.prepare();
+            careportalEvents = getDaoCareportalEvents().query(preparedQuery);
+            return careportalEvents;
+        } catch (SQLException e) {
+            log.error("Unhandled exception", e);
+        }
+        return new ArrayList<>();
     }
 
     public void deleteCareportalEventById(String _id) {
@@ -1570,6 +1617,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();
@@ -1643,6 +1692,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");
+                    // Update data in NS
+                    NSUpload.updateProfileSwitch(profileSwitch);
+                } else {
+                    log.debug("JSON for profile switch doesn't exist. Ignoring: " + trJson.toString());
+                    return;
+                }
+            }
             if (trJson.has("profilePlugin"))
                 profileSwitch.profilePlugin = trJson.getString("profilePlugin");
             createOrUpdate(profileSwitch);

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

@@ -147,6 +147,11 @@ public class ExtendedBolus implements Interval, DataPointWithLabelInterface {
         return durationInMinutes == 0;
     }
 
+    @Override
+    public boolean isValid() {
+        return true;
+    }
+
     // -------- Interval interface end ---------
 
     public String log() {

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

@@ -70,7 +70,7 @@ public class FoodHelper {
     public boolean createOrUpdate(Food food) {
         try {
             // find by NS _id
-            if (food._id != null) {
+            if (food._id != null && !food._id.equals("")) {
                 Food old;
 
                 QueryBuilder<Food, Long> queryBuilder = getDaoFood().queryBuilder();
@@ -90,12 +90,13 @@ public class FoodHelper {
                     } else {
                         return false;
                     }
-                }
+                } else {
-            }
                     getDaoFood().createOrUpdate(food);
                     log.debug("FOOD: New record: " + food.toString());
                     scheduleFoodChange();
                     return true;
+                }
+            }
         } catch (SQLException e) {
             log.error("Unhandled exception", e);
         }

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

@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.db;
 
 import android.graphics.Color;
+import android.support.annotation.Nullable;
 
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
@@ -12,10 +13,14 @@ import org.slf4j.LoggerFactory;
 
 import java.util.Objects;
 
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.interfaces.Interval;
+import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.graphExtensions.DataPointWithLabelInterface;
 import info.nightscout.androidaps.plugins.Overview.graphExtensions.PointsWithLabelGraphSeries;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.ProfileLocal.LocalProfilePlugin;
 import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.DecimalFormatter;
@@ -56,12 +61,14 @@ public class ProfileSwitch implements Interval, DataPointWithLabelInterface {
 
     private Profile profile = null;
 
+    @Nullable
     public Profile getProfileObject() {
         if (profile == null)
             try {
                 profile = new Profile(new JSONObject(profileJson), percentage, timeshift);
-            } catch (JSONException e) {
+            } catch (Exception e) {
                 log.error("Unhandled exception", e);
+                log.error("Unhandled exception", profileJson);
             }
         return profile;
     }
@@ -171,6 +178,20 @@ public class ProfileSwitch implements Interval, DataPointWithLabelInterface {
         return durationInMinutes == 0;
     }
 
+    @Override
+    public boolean isValid() {
+
+        boolean isValid = getProfileObject() != null && getProfileObject().isValid(DateUtil.dateAndTimeString(date));
+        if (!isValid)
+            createNotificationInvalidProfile(DateUtil.dateAndTimeString(date));
+        return isValid;
+    }
+
+    public void createNotificationInvalidProfile(String detail) {
+        Notification notification = new Notification(Notification.ZERO_VALUE_IN_PROFILE, String.format(MainApp.gs(R.string.zerovalueinprofile), detail), Notification.LOW, 5);
+        MainApp.bus().post(new EventNewNotification(notification));
+    }
+
     // -------- Interval interface end ---------
 
     //  ----------------- DataPointInterface --------------------

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

@@ -123,6 +123,11 @@ public class TempTarget implements Interval {
         return durationInMinutes == 0;
     }
 
+    @Override
+    public boolean isValid() {
+        return true;
+    }
+
     // -------- Interval interface end ---------
 
     public String lowValueToUnitsToString(String units) {

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

@@ -182,6 +182,11 @@ public class TemporaryBasal implements Interval {
         return durationInMinutes == 0;
     }
 
+    @Override
+    public boolean isValid() {
+        return true;
+    }
+
     // -------- Interval interface end ---------
 
     public IobTotal iobCalc(long time) {

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

@@ -0,0 +1,8 @@
+package info.nightscout.androidaps.events;
+
+/**
+ * Created by mike on 23.01.2018.
+ */
+
+public class EventAppInitialized extends Event {
+}

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/DanaRInterface.java

@@ -1,9 +1,12 @@
 package info.nightscout.androidaps.interfaces;
 
+import info.nightscout.androidaps.data.PumpEnactResult;
+
 /**
  * Created by mike on 12.06.2017.
  */
 
 public interface DanaRInterface {
-    boolean loadHistory(byte type);
+    PumpEnactResult loadHistory(byte type); // for history browser
+    PumpEnactResult loadEvents(); // events history to build treatments from
 }

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/Interval.java

@@ -21,4 +21,6 @@ public interface Interval {
 
     boolean isInProgress();
     boolean isEndingEvent();
+
+    boolean isValid();
 }

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

@@ -35,4 +35,6 @@ public class PumpDescription {
     public double basalMinimumRate = 0.04d;
 
     public boolean isRefillingCapable = false;
+
+    public boolean storesCarbInfo = true;
 }

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

@@ -16,27 +16,31 @@ public interface PumpInterface {
     boolean isInitialized();
     boolean isSuspended();
     boolean isBusy();
+    boolean isConnected();
+    boolean isConnecting();
+
+    void connect(String reason);
+    void disconnect(String reason);
+    void stopConnecting();
+
+    void getPumpStatus();
 
     // Upload to pump new basal profile
-    int SUCCESS = 0;
+    PumpEnactResult setNewBasalProfile(Profile profile);
-    int FAILED = 1;
-    int NOT_NEEDED = 2;
-    int setNewBasalProfile(Profile profile);
     boolean isThisProfileSet(Profile profile);
 
     Date lastDataTime();
-    void refreshDataFromPump(String reason);
 
     double getBaseBasalRate(); // base basal rate, not temp basal
 
     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
-    PumpEnactResult cancelTempBasal(boolean force);
+    PumpEnactResult cancelTempBasal(boolean enforceNew);
     PumpEnactResult cancelExtendedBolus();
 
     // Status to be passed to NS

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

@@ -3,14 +3,11 @@ package info.nightscout.androidaps.plugins.Actions;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.HandlerThread;
 import android.support.v4.app.Fragment;
 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;
@@ -34,6 +31,8 @@ import info.nightscout.androidaps.plugins.Careportal.CareportalFragment;
 import info.nightscout.androidaps.plugins.Careportal.Dialogs.NewNSTreatmentDialog;
 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.
@@ -46,24 +45,16 @@ public class ActionsFragment extends SubscriberFragment implements View.OnClickL
         return actionsPlugin;
     }
 
-    Button profileSwitch;
+    SingleClickButton profileSwitch;
-    Button tempTarget;
+    SingleClickButton tempTarget;
-    Button extendedBolus;
+    SingleClickButton extendedBolus;
-    Button extendedBolusCancel;
+    SingleClickButton extendedBolusCancel;
-    Button tempBasal;
+    SingleClickButton tempBasal;
-    Button tempBasalCancel;
+    SingleClickButton tempBasalCancel;
-    Button fill;
+    SingleClickButton fill;
-
-    private static Handler sHandler;
-    private static HandlerThread sHandlerThread;
 
     public ActionsFragment() {
         super();
-        if (sHandlerThread == null) {
-            sHandlerThread = new HandlerThread(ActionsFragment.class.getSimpleName());
-            sHandlerThread.start();
-            sHandler = new Handler(sHandlerThread.getLooper());
-        }
     }
 
 
@@ -73,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);
+            profileSwitch = (SingleClickButton) view.findViewById(R.id.actions_profileswitch);
-            tempTarget = (Button) view.findViewById(R.id.actions_temptarget);
+            tempTarget = (SingleClickButton) view.findViewById(R.id.actions_temptarget);
-            extendedBolus = (Button) view.findViewById(R.id.actions_extendedbolus);
+            extendedBolus = (SingleClickButton) view.findViewById(R.id.actions_extendedbolus);
-            extendedBolusCancel = (Button) view.findViewById(R.id.actions_extendedbolus_cancel);
+            extendedBolusCancel = (SingleClickButton) view.findViewById(R.id.actions_extendedbolus_cancel);
-            tempBasal = (Button) view.findViewById(R.id.actions_settempbasal);
+            tempBasal = (SingleClickButton) view.findViewById(R.id.actions_settempbasal);
-            tempBasalCancel = (Button) view.findViewById(R.id.actions_canceltempbasal);
+            tempBasalCancel = (SingleClickButton) view.findViewById(R.id.actions_canceltempbasal);
-            fill = (Button) view.findViewById(R.id.actions_fill);
+            fill = (SingleClickButton) view.findViewById(R.id.actions_fill);
 
             profileSwitch.setOnClickListener(this);
             tempTarget.setOnClickListener(this);
@@ -135,14 +126,14 @@ public class ActionsFragment extends SubscriberFragment implements View.OnClickL
                         fill.setVisibility(View.GONE);
                         return;
                     }
-                    boolean allowProfileSwitch = MainApp.getConfigBuilder().getActiveProfileInterface().getProfile().getProfileList().size() > 1;
+                    final PumpInterface pump = ConfigBuilderPlugin.getActivePump();
-                    if (!MainApp.getConfigBuilder().getPumpDescription().isSetBasalProfileCapable || !MainApp.getConfigBuilder().isInitialized() || MainApp.getConfigBuilder().isSuspended() || !allowProfileSwitch)
+                    if (!pump.getPumpDescription().isSetBasalProfileCapable || !pump.isInitialized() || pump.isSuspended())
                         profileSwitch.setVisibility(View.GONE);
                     else
                         profileSwitch.setVisibility(View.VISIBLE);
 
 
-                    if (!MainApp.getConfigBuilder().getPumpDescription().isExtendedBolusCapable || !MainApp.getConfigBuilder().isInitialized() || MainApp.getConfigBuilder().isSuspended() || MainApp.getConfigBuilder().isFakingTempsByExtendedBoluses()) {
+                    if (!pump.getPumpDescription().isExtendedBolusCapable || !pump.isInitialized() || pump.isSuspended() || pump.isFakingTempsByExtendedBoluses()) {
                         extendedBolus.setVisibility(View.GONE);
                         extendedBolusCancel.setVisibility(View.GONE);
                     } else {
@@ -158,7 +149,7 @@ public class ActionsFragment extends SubscriberFragment implements View.OnClickL
                     }
 
 
-                    if (!MainApp.getConfigBuilder().getPumpDescription().isTempBasalCapable || !MainApp.getConfigBuilder().isInitialized() || MainApp.getConfigBuilder().isSuspended()) {
+                    if (!pump.getPumpDescription().isTempBasalCapable || !pump.isInitialized() || pump.isSuspended()) {
                         tempBasal.setVisibility(View.GONE);
                         tempBasalCancel.setVisibility(View.GONE);
                     } else {
@@ -173,7 +164,7 @@ public class ActionsFragment extends SubscriberFragment implements View.OnClickL
                         }
                     }
 
-                    if (!MainApp.getConfigBuilder().getPumpDescription().isRefillingCapable || !MainApp.getConfigBuilder().isInitialized() || MainApp.getConfigBuilder().isSuspended())
+                    if (!pump.getPumpDescription().isRefillingCapable || !pump.isInitialized() || pump.isSuspended())
                         fill.setVisibility(View.GONE);
                     else
                         fill.setVisibility(View.VISIBLE);
@@ -190,7 +181,6 @@ public class ActionsFragment extends SubscriberFragment implements View.OnClickL
     @Override
     public void onClick(View view) {
         FragmentManager manager = getFragmentManager();
-        final PumpInterface pump = MainApp.getConfigBuilder();
         switch (view.getId()) {
             case R.id.actions_profileswitch:
                 NewNSTreatmentDialog newDialog = new NewNSTreatmentDialog();
@@ -212,25 +202,15 @@ public class ActionsFragment extends SubscriberFragment implements View.OnClickL
                 break;
             case R.id.actions_extendedbolus_cancel:
                 if (MainApp.getConfigBuilder().isInHistoryExtendedBoluslInProgress()) {
-                    sHandler.post(new Runnable() {
+                    ConfigBuilderPlugin.getCommandQueue().cancelExtended(null);
-                        @Override
-                        public void run() {
-                            pump.cancelExtendedBolus();
                     Answers.getInstance().logCustom(new CustomEvent("CancelExtended"));
                 }
-                    });
-                }
                 break;
             case R.id.actions_canceltempbasal:
                 if (MainApp.getConfigBuilder().isTempBasalInProgress()) {
-                    sHandler.post(new Runnable() {
+                    ConfigBuilderPlugin.getCommandQueue().cancelTempBasal(true, null);
-                        @Override
-                        public void run() {
-                            pump.cancelTempBasal(true);
                     Answers.getInstance().logCustom(new CustomEvent("CancelTemp"));
                 }
-                    });
-                }
                 break;
             case R.id.actions_settempbasal:
                 NewTempBasalDialog newTempDialog = new NewTempBasalDialog();

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

@@ -2,9 +2,8 @@ package info.nightscout.androidaps.plugins.Actions.dialogs;
 
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.HandlerThread;
 import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
@@ -27,11 +26,10 @@ import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
-import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.Dialogs.ErrorHelperActivity;
-import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
+import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.utils.DecimalFormatter;
 import info.nightscout.utils.NumberPicker;
 import info.nightscout.utils.SP;
@@ -48,13 +46,7 @@ public class FillDialog extends DialogFragment implements OnClickListener {
 
     NumberPicker editInsulin;
 
-    Handler mHandler;
-    public static HandlerThread mHandlerThread;
-
     public FillDialog() {
-        mHandlerThread = new HandlerThread(FillDialog.class.getSimpleName());
-        mHandlerThread.start();
-        this.mHandler = new Handler(mHandlerThread.getLooper());
     }
 
     @Override
@@ -69,7 +61,7 @@ public class FillDialog extends DialogFragment implements OnClickListener {
         getDialog().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
 
         Double maxInsulin = MainApp.getConfigBuilder().applyBolusConstraints(Constants.bolusOnlyForCheckLimit);
-        double bolusstep = MainApp.getConfigBuilder().getPumpDescription().bolusStep;
+        double bolusstep = ConfigBuilderPlugin.getActivePump().getPumpDescription().bolusStep;
         editInsulin = (NumberPicker) view.findViewById(R.id.treatments_newtreatment_insulinamount);
         editInsulin.setParams(0d, 0d, maxInsulin, bolusstep, new DecimalFormat("0.00"), false);
 
@@ -108,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;
     }
 
@@ -158,28 +153,21 @@ public class FillDialog extends DialogFragment implements OnClickListener {
             builder.setPositiveButton(getString(R.string.primefill), new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialog, int id) {
                     if (finalInsulinAfterConstraints > 0) {
-                        final ConfigBuilderPlugin pump = MainApp.getConfigBuilder();
-                        mHandler.post(new Runnable() {
-                            @Override
-                            public void run() {
                         DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo();
                         detailedBolusInfo.insulin = finalInsulinAfterConstraints;
                         detailedBolusInfo.context = context;
                         detailedBolusInfo.source = Source.USER;
                         detailedBolusInfo.isValid = false; // do not count it in IOB (for pump history)
-                                PumpEnactResult result = pump.deliverTreatment(detailedBolusInfo);
+                        ConfigBuilderPlugin.getCommandQueue().bolus(detailedBolusInfo, new Callback() {
+                            @Override
+                            public void run() {
                                 if (!result.success) {
-                                    try {
+                                    Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
-                                        AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                                    i.putExtra("soundid", R.raw.boluserror);
-                                        builder.setTitle(MainApp.sResources.getString(R.string.treatmentdeliveryerror));
+                                    i.putExtra("status", result.comment);
-                                        builder.setMessage(result.comment);
+                                    i.putExtra("title", MainApp.sResources.getString(R.string.treatmentdeliveryerror));
-                                        builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), null);
+                                    i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                        builder.show();
+                                    MainApp.instance().startActivity(i);
-                                    } catch (WindowManager.BadTokenException | NullPointerException e) {
-                                        // window has been destroyed
-                                        Notification notification = new Notification(Notification.BOLUS_DELIVERY_ERROR, MainApp.sResources.getString(R.string.treatmentdeliveryerror), Notification.URGENT);
-                                        MainApp.bus().post(new EventNewNotification(notification));
-                                    }
                                 }
                             }
                         });

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

@@ -2,15 +2,13 @@ package info.nightscout.androidaps.plugins.Actions.dialogs;
 
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.HandlerThread;
 import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
 
 import com.crashlytics.android.answers.Answers;
 import com.crashlytics.android.answers.CustomEvent;
@@ -23,10 +21,9 @@ import java.text.DecimalFormat;
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.PumpEnactResult;
+import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.interfaces.PumpInterface;
+import info.nightscout.androidaps.plugins.Overview.Dialogs.ErrorHelperActivity;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.utils.NumberPicker;
 import info.nightscout.utils.SafeParse;
 
@@ -36,13 +33,7 @@ public class NewExtendedBolusDialog extends DialogFragment implements View.OnCli
     NumberPicker editInsulin;
     NumberPicker editDuration;
 
-    Handler mHandler;
-    public static HandlerThread mHandlerThread;
-
     public NewExtendedBolusDialog() {
-        mHandlerThread = new HandlerThread(NewExtendedBolusDialog.class.getSimpleName());
-        mHandlerThread.start();
-        this.mHandler = new Handler(mHandlerThread.getLooper());
     }
 
     @Override
@@ -56,21 +47,17 @@ public class NewExtendedBolusDialog extends DialogFragment implements View.OnCli
         editInsulin = (NumberPicker) view.findViewById(R.id.overview_newextendedbolus_insulin);
         editInsulin.setParams(0d, 0d, maxInsulin, 0.1d, new DecimalFormat("0.00"), false);
 
-        double extendedDurationStep = MainApp.getConfigBuilder().getPumpDescription().extendedBolusDurationStep;
+        double extendedDurationStep = ConfigBuilderPlugin.getActivePump().getPumpDescription().extendedBolusDurationStep;
-        double extendedMaxDuration = MainApp.getConfigBuilder().getPumpDescription().extendedBolusMaxDuration;
+        double extendedMaxDuration = ConfigBuilderPlugin.getActivePump().getPumpDescription().extendedBolusMaxDuration;
         editDuration = (NumberPicker) view.findViewById(R.id.overview_newextendedbolus_duration);
         editDuration.setParams(extendedDurationStep, extendedDurationStep, extendedMaxDuration, extendedDurationStep, new DecimalFormat("0"), false);
 
         view.findViewById(R.id.ok).setOnClickListener(this);
         view.findViewById(R.id.cancel).setOnClickListener(this);
-        return view;
-    }
 
-    @Override
+        setCancelable(true);
-    public void onResume() {
+        getDialog().setCanceledOnTouchOutside(false);
-        super.onResume();
+        return view;
-        if (getDialog() != null)
-            getDialog().getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
     }
 
     @Override
@@ -99,23 +86,16 @@ public class NewExtendedBolusDialog extends DialogFragment implements View.OnCli
                     builder.setMessage(confirmMessage);
                     builder.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int id) {
-                            final PumpInterface pump = MainApp.getConfigBuilder();
+                            ConfigBuilderPlugin.getCommandQueue().extendedBolus(finalInsulin, finalDurationInMinutes, new Callback() {
-                            mHandler.post(new Runnable() {
                                 @Override
                                 public void run() {
-                                    PumpEnactResult result = pump.setExtendedBolus(finalInsulin, finalDurationInMinutes);
                                     if (!result.success) {
-                                        try {
+                                        Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
-                                            AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                                        i.putExtra("soundid", R.raw.boluserror);
-                                            builder.setTitle(context.getString(R.string.treatmentdeliveryerror));
+                                        i.putExtra("status", result.comment);
-                                            builder.setMessage(result.comment);
+                                        i.putExtra("title", MainApp.sResources.getString(R.string.treatmentdeliveryerror));
-                                            builder.setPositiveButton(context.getString(R.string.ok), null);
+                                        i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                            builder.show();
+                                        MainApp.instance().startActivity(i);
-                                        } catch (WindowManager.BadTokenException | NullPointerException e) {
-                                            // window has been destroyed
-                                            Notification notification = new Notification(Notification.BOLUS_DELIVERY_ERROR, MainApp.sResources.getString(R.string.treatmentdeliveryerror), Notification.URGENT);
-                                            MainApp.bus().post(new EventNewNotification(notification));
-                                        }
                                     }
                                 }
                             });

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

@@ -1,11 +1,9 @@
 package info.nightscout.androidaps.plugins.Actions.dialogs;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.HandlerThread;
 import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
@@ -26,9 +24,10 @@ import java.text.DecimalFormat;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.data.PumpEnactResult;
 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.Dialogs.ErrorHelperActivity;
+import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.utils.NumberPicker;
 import info.nightscout.utils.SafeParse;
 
@@ -47,13 +46,7 @@ public class NewTempBasalDialog extends DialogFragment implements View.OnClickLi
     NumberPicker basalAbsolute;
     NumberPicker duration;
 
-    Handler mHandler;
-    public static HandlerThread mHandlerThread;
-
     public NewTempBasalDialog() {
-        mHandlerThread = new HandlerThread(NewTempBasalDialog.class.getSimpleName());
-        mHandlerThread.start();
-        this.mHandler = new Handler(mHandlerThread.getLooper());
     }
 
     @Override
@@ -70,7 +63,7 @@ public class NewTempBasalDialog extends DialogFragment implements View.OnClickLi
         absoluteRadio = (RadioButton) view.findViewById(R.id.overview_newtempbasal_absolute_radio);
         typeSelectorLayout = (LinearLayout) view.findViewById(R.id.overview_newtempbasal_typeselector_layout);
 
-        PumpDescription pumpDescription = MainApp.getConfigBuilder().getPumpDescription();
+        PumpDescription pumpDescription = ConfigBuilderPlugin.getActivePump().getPumpDescription();
 
         basalPercent = (NumberPicker) view.findViewById(R.id.overview_newtempbasal_basalpercentinput);
         double maxTempPercent = pumpDescription.maxTempPercent;
@@ -109,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;
     }
 
@@ -143,37 +139,29 @@ public class NewTempBasalDialog extends DialogFragment implements View.OnClickLi
                     final Double finalBasal = absolute;
                     final int finalDurationInMinutes = durationInMinutes;
 
-                    final Context context = getContext();
+                    AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
-                    AlertDialog.Builder builder = new AlertDialog.Builder(context);
                     builder.setTitle(this.getContext().getString(R.string.confirmation));
                     builder.setMessage(confirmMessage);
                     builder.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int id) {
-                            final PumpInterface pump = MainApp.getConfigBuilder();
+                            Callback callback = new Callback() {
-                            mHandler.post(new Runnable() {
                                 @Override
                                 public void run() {
-                                    PumpEnactResult result;
-                                    if (setAsPercent) {
-                                        result = pump.setTempBasalPercent(finalBasalPercent, finalDurationInMinutes);
-                                    } else {
-                                        result = pump.setTempBasalAbsolute(finalBasal, finalDurationInMinutes, true);
-                                    }
                                     if (!result.success) {
-                                        if (context instanceof Activity) {
+                                        Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
-                                            Activity activity = (Activity) context;
+                                        i.putExtra("soundid", R.raw.boluserror);
-                                            if (activity.isFinishing()) {
+                                        i.putExtra("status", result.comment);
-                                                return;
+                                        i.putExtra("title", MainApp.sResources.getString(R.string.tempbasaldeliveryerror));
+                                        i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                                        MainApp.instance().startActivity(i);
                                     }
                                 }
-                                        AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                            };
-                                        builder.setTitle(MainApp.sResources.getString(R.string.tempbasaldeliveryerror));
+                            if (setAsPercent) {
-                                        builder.setMessage(result.comment);
+                                ConfigBuilderPlugin.getCommandQueue().tempBasalPercent(finalBasalPercent, finalDurationInMinutes, true, callback);
-                                        builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), null);
+                            } else {
-                                        builder.show();
+                                ConfigBuilderPlugin.getCommandQueue().tempBasalAbsolute(finalBasal, finalDurationInMinutes, true, callback);
                             }
-                                }
-                            });
                             Answers.getInstance().logCustom(new CustomEvent("TempBasal"));
                         }
                     });

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

@@ -14,6 +14,7 @@ import com.crashlytics.android.Crashlytics;
 import com.squareup.otto.Subscribe;
 
 import info.nightscout.androidaps.BuildConfig;
+import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.ProfileStore;
@@ -104,7 +105,7 @@ public class CareportalFragment extends SubscriberFragment implements View.OnCli
                 butonsLayout.setVisibility(View.VISIBLE);
             }
 
-            if (BuildConfig.NSCLIENTOLNY)
+            if (Config.NSCLIENT || Config.G5UPLOADER)
                 statsLayout.setVisibility(View.GONE); // visible on overview
 
             updateGUI();

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

@@ -67,7 +67,7 @@ public class CareportalPlugin implements PluginBase {
 
     @Override
     public boolean showInList(int type) {
-        return !Config.NSCLIENT;
+        return !Config.NSCLIENT && !Config.G5UPLOADER;
     }
 
     @Override

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

@@ -3,9 +3,8 @@ package info.nightscout.androidaps.plugins.Careportal.Dialogs;
 
 import android.app.Activity;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.HandlerThread;
 import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AlertDialog;
 import android.text.Editable;
@@ -51,9 +50,10 @@ import info.nightscout.androidaps.db.ProfileSwitch;
 import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.db.TempTarget;
 import info.nightscout.androidaps.events.EventNewBasalProfile;
-import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.Careportal.OptionsToShow;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
+import info.nightscout.androidaps.plugins.Overview.Dialogs.ErrorHelperActivity;
+import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.NSUpload;
 import info.nightscout.utils.NumberPicker;
@@ -105,10 +105,6 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
 
     Date eventTime;
 
-    private static Handler sHandler;
-    private static HandlerThread sHandlerThread;
-
-
     public void setOptions(OptionsToShow options, int event) {
         this.options = options;
         this.event = MainApp.sResources.getString(event);
@@ -116,11 +112,6 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
 
     public NewNSTreatmentDialog() {
         super();
-        if (sHandlerThread == null) {
-            sHandlerThread = new HandlerThread(NewNSTreatmentDialog.class.getSimpleName());
-            sHandlerThread.start();
-            sHandler = new Handler(sHandlerThread.getLooper());
-        }
     }
 
     @Override
@@ -184,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);
         }
 
@@ -210,10 +201,13 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
 
                 if (MainApp.sResources.getString(R.string.eatingsoon).equals(reasonList.get(position))) {
                     defaultDuration = SP.getDouble(R.string.key_eatingsoon_duration, 0d);
-                    defaultTarget = SP.getDouble(R.string.key_eatingsoon_target, 0d);;
+                    defaultTarget = SP.getDouble(R.string.key_eatingsoon_target, 0d);
+                    ;
                 } else if (MainApp.sResources.getString(R.string.activity).equals(reasonList.get(position))) {
-                    defaultDuration = SP.getDouble(R.string.key_activity_duration, 0d);;
+                    defaultDuration = SP.getDouble(R.string.key_activity_duration, 0d);
-                    defaultTarget = SP.getDouble(R.string.key_activity_target, 0d);;
+                    ;
+                    defaultTarget = SP.getDouble(R.string.key_activity_target, 0d);
+                    ;
                 } else {
                     defaultDuration = 0;
                     erase = true;
@@ -366,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;
     }
 
@@ -538,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) {
@@ -674,10 +670,6 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
                 } else if (options.executeTempTarget) {
                     try {
                         if ((data.has("targetBottom") && data.has("targetTop")) || (data.has("duration") && data.getInt("duration") == 0)) {
-                            sHandler.post(new Runnable() {
-                                @Override
-                                public void run() {
-                                    try {
                             TempTarget tempTarget = new TempTarget();
                             tempTarget.date = eventTime.getTime();
                             tempTarget.durationInMinutes = data.getInt("duration");
@@ -694,11 +686,6 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
                             MainApp.getDbHelper().createOrUpdate(tempTarget);
                             NSUpload.uploadCareportalEntryToNS(data);
                             Answers.getInstance().logCustom(new CustomEvent("TempTarget"));
-                                    } catch (JSONException e) {
-                                        log.error("Unhandled exception", e);
-                                    }
-                                }
-                            });
                         }
                     } catch (JSONException e) {
                         log.error("Unhandled exception", e);
@@ -714,9 +701,6 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
     }
 
     public static void doProfileSwitch(final ProfileStore profileStore, final String profileName, final int duration, final int percentage, final int timeshift) {
-        sHandler.post(new Runnable() {
-            @Override
-            public void run() {
         ProfileSwitch profileSwitch = new ProfileSwitch();
         profileSwitch.date = System.currentTimeMillis();
         profileSwitch.source = Source.USER;
@@ -729,22 +713,24 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
         profileSwitch.percentage = percentage;
         MainApp.getConfigBuilder().addToHistoryProfileSwitch(profileSwitch);
 
-                PumpInterface pump = MainApp.getConfigBuilder();
+        ConfigBuilderPlugin.getCommandQueue().setProfile(profileSwitch.getProfileObject(), new Callback() {
-                if (pump != null) {
+            @Override
-                    pump.setNewBasalProfile(profileSwitch.getProfileObject());
+            public void run() {
-                    MainApp.bus().post(new EventNewBasalProfile());
+                if (!result.success) {
-                } else {
+                    Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
-                    log.error("No active pump selected");
+                    i.putExtra("soundid", R.raw.boluserror);
+                    i.putExtra("status", result.comment);
+                    i.putExtra("title", MainApp.sResources.getString(R.string.failedupdatebasalprofile));
+                    i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    MainApp.instance().startActivity(i);
                 }
-                Answers.getInstance().logCustom(new CustomEvent("ProfileSwitch"));
+                MainApp.bus().post(new EventNewBasalProfile());
             }
         });
+        Answers.getInstance().logCustom(new CustomEvent("ProfileSwitch"));
     }
 
     public static void doProfileSwitch(final int duration, final int percentage, final int timeshift) {
-        sHandler.post(new Runnable() {
-            @Override
-            public void run() {
         ProfileSwitch profileSwitch = MainApp.getConfigBuilder().getProfileSwitchFromHistory(System.currentTimeMillis());
         if (profileSwitch != null) {
             profileSwitch = new ProfileSwitch();
@@ -759,19 +745,24 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
             profileSwitch.percentage = percentage;
             MainApp.getConfigBuilder().addToHistoryProfileSwitch(profileSwitch);
 
-                    PumpInterface pump = MainApp.getConfigBuilder();
+            ConfigBuilderPlugin.getCommandQueue().setProfile(profileSwitch.getProfileObject(), new Callback() {
-                    if (pump != null) {
+                @Override
-                        pump.setNewBasalProfile(profileSwitch.getProfileObject());
+                public void run() {
-                        MainApp.bus().post(new EventNewBasalProfile());
+                    if (!result.success) {
-                    } else {
+                        Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
-                        log.error("No active pump selected");
+                        i.putExtra("soundid", R.raw.boluserror);
+                        i.putExtra("status", result.comment);
+                        i.putExtra("title", MainApp.sResources.getString(R.string.failedupdatebasalprofile));
+                        i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                        MainApp.instance().startActivity(i);
                     }
+                    MainApp.bus().post(new EventNewBasalProfile());
+                }
+            });
             Answers.getInstance().logCustom(new CustomEvent("ProfileSwitch"));
         } else {
             log.error("No profile switch existing");
         }
     }
-        });
-    }
 
 }

app/src/main/java/info/nightscout/androidaps/plugins/Common/SubscriberFragment.java

@@ -2,9 +2,12 @@ package info.nightscout.androidaps.plugins.Common;
 
 import android.support.v4.app.Fragment;
 
+import butterknife.Unbinder;
 import info.nightscout.androidaps.MainApp;
 
 abstract public class SubscriberFragment extends Fragment {
+    protected Unbinder unbinder;
+
     @Override
     public void onPause() {
         super.onPause();
@@ -18,5 +21,12 @@ abstract public class SubscriberFragment extends Fragment {
         updateGUI();
     }
 
+    @Override public void onDestroyView() {
+        super.onDestroyView();
+        if (unbinder != null)
+            unbinder.unbind();
+    }
+
+
     protected abstract void updateGUI();
 }

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

@@ -1,12 +1,8 @@
 package info.nightscout.androidaps.plugins.ConfigBuilder;
 
-import android.content.Context;
-import android.content.Intent;
 import android.content.SharedPreferences;
-import android.os.PowerManager;
 import android.preference.PreferenceManager;
 import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -14,16 +10,16 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 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.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;
@@ -32,33 +28,30 @@ import info.nightscout.androidaps.db.ProfileSwitch;
 import info.nightscout.androidaps.db.TempTarget;
 import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.db.Treatment;
-import info.nightscout.androidaps.events.EventBolusRequested;
+import info.nightscout.androidaps.events.EventAppInitialized;
 import info.nightscout.androidaps.interfaces.APSInterface;
 import info.nightscout.androidaps.interfaces.BgSourceInterface;
 import info.nightscout.androidaps.interfaces.ConstraintsInterface;
 import info.nightscout.androidaps.interfaces.InsulinInterface;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.interfaces.ProfileInterface;
-import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 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.Dialogs.BolusProgressDialog;
-import info.nightscout.androidaps.plugins.Overview.Dialogs.BolusProgressHelperActivity;
-import info.nightscout.androidaps.plugins.Overview.Notification;
-import info.nightscout.androidaps.plugins.Overview.events.EventDismissBolusprogressIfRunning;
-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.androidaps.plugins.PumpVirtual.VirtualPumpPlugin;
+import info.nightscout.androidaps.queue.Callback;
+import info.nightscout.androidaps.queue.CommandQueue;
 import info.nightscout.utils.NSUpload;
 import info.nightscout.utils.SP;
 
 /**
  * Created by mike on 05.08.2016.
  */
-public class ConfigBuilderPlugin implements PluginBase, PumpInterface, ConstraintsInterface, TreatmentsInterface {
+public class ConfigBuilderPlugin implements PluginBase, ConstraintsInterface, TreatmentsInterface {
     private static Logger log = LoggerFactory.getLogger(ConfigBuilderPlugin.class);
 
     private static BgSourceInterface activeBgSource;
@@ -77,12 +70,10 @@ public class ConfigBuilderPlugin implements PluginBase, PumpInterface, Constrain
 
     private static ArrayList<PluginBase> pluginList;
 
-    private PowerManager.WakeLock mWakeLock;
+    private static CommandQueue commandQueue = new CommandQueue();
 
     public ConfigBuilderPlugin() {
         MainApp.bus().register(this);
-        PowerManager powerManager = (PowerManager) MainApp.instance().getApplicationContext().getSystemService(Context.POWER_SERVICE);
-        mWakeLock = powerManager.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK, "ConfigBuilderPlugin");
     }
 
     @Override
@@ -154,6 +145,7 @@ public class ConfigBuilderPlugin implements PluginBase, PumpInterface, Constrain
     public void initialize() {
         pluginList = MainApp.getPluginsList();
         loadSettings();
+        MainApp.bus().post(new EventAppInitialized());
     }
 
     public void storeSettings() {
@@ -197,6 +189,10 @@ public class ConfigBuilderPlugin implements PluginBase, PumpInterface, Constrain
         verifySelectionInCategories();
     }
 
+    public static CommandQueue getCommandQueue() {
+        return commandQueue;
+    }
+
     public static BgSourceInterface getActiveBgSource() {
         return activeBgSource;
     }
@@ -358,294 +354,75 @@ public class ConfigBuilderPlugin implements PluginBase, PumpInterface, Constrain
     }
 
     /*
-        * Pump interface
+        * Ex Pump interface
         *
         * Config builder return itself as a pump and check constraints before it passes command to pump driver
         */
-    @Override
-    public boolean isInitialized() {
-        if (activePump != null)
-            return activePump.isInitialized();
-        else return true;
-    }
 
-    @Override
-    public boolean isSuspended() {
-        if (activePump != null)
-            return activePump.isSuspended();
-        else return false;
-    }
-
-    @Override
-    public boolean isBusy() {
-        if (activePump != null)
-            return activePump.isBusy();
-        else return false;
-    }
-
-    @Override
-    public int setNewBasalProfile(Profile profile) {
-        // Compare with pump limits
-        Profile.BasalValue[] basalValues = profile.getBasalValues();
-
-        for (int index = 0; index < basalValues.length; index++) {
-            if (basalValues[index].value < getPumpDescription().basalMinimumRate) {
-                Notification notification = new Notification(Notification.BASAL_VALUE_BELOW_MINIMUM, MainApp.sResources.getString(R.string.basalvaluebelowminimum), Notification.URGENT);
-                MainApp.bus().post(new EventNewNotification(notification));
-                return FAILED;
-            }
-        }
-
-        MainApp.bus().post(new EventDismissNotification(Notification.BASAL_VALUE_BELOW_MINIMUM));
-
-        if (isThisProfileSet(profile)) {
-            log.debug("Correct profile already set");
-            return NOT_NEEDED;
-        } else if (activePump != null) {
-            return activePump.setNewBasalProfile(profile);
-        } else
-            return SUCCESS;
-    }
-
-    @Override
-    public boolean isThisProfileSet(Profile profile) {
-        if (activePump != null) {
-            boolean result = activePump.isThisProfileSet(profile);
-            if (result == false) {
-                log.debug("Current profile: " + getProfile().getData().toString());
-                log.debug("New profile: " + profile.getData().toString());
-            }
-            return result;
-        } else return true;
-    }
-
-    @Override
-    public Date lastDataTime() {
-        if (activePump != null)
-            return activePump.lastDataTime();
-        else return new Date();
-    }
-
-    @Override
-    public void refreshDataFromPump(String reason) {
-        if (activePump != null)
-            activePump.refreshDataFromPump(reason);
-    }
-
-    @Override
-    public double getBaseBasalRate() {
-        if (activePump != null)
-            return activePump.getBaseBasalRate();
-        else
-            return 0d;
-    }
-
-    @Override
-    public PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo) {
-        mWakeLock.acquire();
-        PumpEnactResult result;
-        detailedBolusInfo.insulin = applyBolusConstraints(detailedBolusInfo.insulin);
-        detailedBolusInfo.carbs = applyCarbsConstraints((int) detailedBolusInfo.carbs);
-
-        BolusProgressDialog bolusProgressDialog = null;
-        if (detailedBolusInfo.context != null) {
-            bolusProgressDialog = new BolusProgressDialog();
-            bolusProgressDialog.setInsulin(detailedBolusInfo.insulin);
-            bolusProgressDialog.show(((AppCompatActivity) detailedBolusInfo.context).getSupportFragmentManager(), "BolusProgress");
-        } else {
-            Intent i = new Intent();
-            i.putExtra("insulin", detailedBolusInfo.insulin);
-            i.setClass(MainApp.instance(), BolusProgressHelperActivity.class);
-            i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            MainApp.instance().startActivity(i);
-        }
-
-
-        MainApp.bus().post(new EventBolusRequested(detailedBolusInfo.insulin));
-
-        result = activePump.deliverTreatment(detailedBolusInfo);
-
-        BolusProgressDialog.bolusEnded = true;
-        MainApp.bus().post(new EventDismissBolusprogressIfRunning(result));
-
-        mWakeLock.release();
-        return result;
-    }
-
-    @Override
-    public void stopBolusDelivering() {
-        activePump.stopBolusDelivering();
-    }
-
-    /**
-     * apply constraints, set temp based on absolute valus and expecting absolute result
-     *
-     * @param absoluteRate
-     * @param durationInMinutes
-     * @return
-     */
-    @Override
-    public PumpEnactResult setTempBasalAbsolute(Double absoluteRate, Integer durationInMinutes, boolean force) {
-        Double rateAfterConstraints = applyBasalConstraints(absoluteRate);
-        PumpEnactResult result = activePump.setTempBasalAbsolute(rateAfterConstraints, durationInMinutes, force);
-        if (Config.logCongigBuilderActions)
-            log.debug("setTempBasalAbsolute rate: " + rateAfterConstraints + " durationInMinutes: " + durationInMinutes + " success: " + result.success + " enacted: " + result.enacted);
-        return result;
-    }
-
-    public PumpEnactResult setTempBasalAbsolute(Double absoluteRate, Integer durationInMinutes) {
-        return setTempBasalAbsolute(absoluteRate, durationInMinutes, false);
-    }
-
-    /**
-     * apply constraints, set temp based on percent and expecting result in percent
-     *
-     * @param percent           0 ... 100 ...
-     * @param durationInMinutes
-     * @return result
-     */
-    @Override
-    public PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes) {
-        Integer percentAfterConstraints = applyBasalConstraints(percent);
-        PumpEnactResult result = activePump.setTempBasalPercent(percentAfterConstraints, durationInMinutes);
-        if (Config.logCongigBuilderActions)
-            log.debug("setTempBasalPercent percent: " + percentAfterConstraints + " durationInMinutes: " + durationInMinutes + " success: " + result.success + " enacted: " + result.enacted);
-        return result;
-    }
-
-    @Override
-    public PumpEnactResult setExtendedBolus(Double insulin, Integer durationInMinutes) {
-        Double rateAfterConstraints = applyBolusConstraints(insulin);
-        PumpEnactResult result = activePump.setExtendedBolus(rateAfterConstraints, durationInMinutes);
-        if (Config.logCongigBuilderActions)
-            log.debug("setExtendedBolus rate: " + rateAfterConstraints + " durationInMinutes: " + durationInMinutes + " success: " + result.success + " enacted: " + result.enacted);
-        return result;
-    }
-
-    @Override
-    public PumpEnactResult cancelTempBasal(boolean force) {
-        PumpEnactResult result = activePump.cancelTempBasal(force);
-        if (Config.logCongigBuilderActions)
-            log.debug("cancelTempBasal success: " + result.success + " enacted: " + result.enacted);
-        return result;
-    }
-
-    @Override
-    public PumpEnactResult cancelExtendedBolus() {
-        PumpEnactResult result = activePump.cancelExtendedBolus();
-        if (Config.logCongigBuilderActions)
-            log.debug("cancelExtendedBolus success: " + result.success + " enacted: " + result.enacted);
-        return result;
-    }
 
     /**
      * expect absolute request and allow both absolute and percent response based on pump capabilities
      *
      * @param request
      * @return
+     *      true if command is going to be executed
+     *      false if error
      */
 
-    public PumpEnactResult applyAPSRequest(APSResult request) {
+    public boolean applyAPSRequest(APSResult request, Callback callback) {
+        PumpInterface pump = getActivePump();
         request.rate = applyBasalConstraints(request.rate);
         PumpEnactResult result;
 
-        if (!isInitialized()) {
+        if (!pump.isInitialized()) {
-            result = new PumpEnactResult();
-            result.comment = MainApp.sResources.getString(R.string.pumpNotInitialized);
-            result.enacted = false;
-            result.success = false;
             log.debug("applyAPSRequest: " + MainApp.sResources.getString(R.string.pumpNotInitialized));
-            return result;
+            if (callback != null) {
+                callback.result(new PumpEnactResult().comment(MainApp.sResources.getString(R.string.pumpNotInitialized)).enacted(false).success(false)).run();
+            }
+            return false;
         }
 
-        if (isSuspended()) {
+        if (pump.isSuspended()) {
-            result = new PumpEnactResult();
-            result.comment = MainApp.sResources.getString(R.string.pumpsuspended);
-            result.enacted = false;
-            result.success = false;
             log.debug("applyAPSRequest: " + MainApp.sResources.getString(R.string.pumpsuspended));
-            return result;
+            if (callback != null) {
+                callback.result(new PumpEnactResult().comment(MainApp.sResources.getString(R.string.pumpsuspended)).enacted(false).success(false)).run();
+            }
+            return false;
         }
 
         if (Config.logCongigBuilderActions)
             log.debug("applyAPSRequest: " + request.toString());
-        if ((request.rate == 0 && request.duration == 0) || Math.abs(request.rate - getBaseBasalRate()) < getPumpDescription().basalStep) {
+        if ((request.rate == 0 && request.duration == 0) || Math.abs(request.rate - pump.getBaseBasalRate()) < pump.getPumpDescription().basalStep) {
             if (isTempBasalInProgress()) {
                 if (Config.logCongigBuilderActions)
                     log.debug("applyAPSRequest: cancelTempBasal()");
-                result = cancelTempBasal(false);
+                getCommandQueue().cancelTempBasal(false, callback);
+                return true;
             } else {
-                result = new PumpEnactResult();
-                result.absolute = request.rate;
-                result.duration = 0;
-                result.enacted = false;
-                result.comment = "Basal set correctly";
-                result.success = true;
                 if (Config.logCongigBuilderActions)
                     log.debug("applyAPSRequest: Basal set correctly");
+                if (callback != null) {
+                    callback.result(new PumpEnactResult().absolute(request.rate).duration(0).enacted(false).success(true).comment("Basal set correctly")).run();
+                }
+                return false;
             }
         } else if (isTempBasalInProgress()
                 && getTempBasalRemainingMinutesFromHistory() > 5
-                && Math.abs(request.rate - getTempBasalAbsoluteRateHistory()) < getPumpDescription().basalStep) {
+                && Math.abs(request.rate - getTempBasalAbsoluteRateHistory()) < pump.getPumpDescription().basalStep) {
-            result = new PumpEnactResult();
-            result.absolute = getTempBasalAbsoluteRateHistory();
-            result.duration = getTempBasalFromHistory(System.currentTimeMillis()).getPlannedRemainingMinutes();
-            result.enacted = false;
-            result.comment = "Temp basal set correctly";
-            result.success = true;
             if (Config.logCongigBuilderActions)
                 log.debug("applyAPSRequest: Temp basal set correctly");
+            if (callback != null) {
+                callback.result(new PumpEnactResult().absolute(getTempBasalAbsoluteRateHistory()).duration(getTempBasalFromHistory(System.currentTimeMillis()).getPlannedRemainingMinutes()).enacted(false).success(true).comment("Temp basal set correctly")).run();
+            }
+            return false;
         } else {
             if (Config.logCongigBuilderActions)
                 log.debug("applyAPSRequest: setTempBasalAbsolute()");
-            result = setTempBasalAbsolute(request.rate, request.duration);
+            getCommandQueue().tempBasalAbsolute(request.rate, request.duration, false, callback);
-        }
+            return true;
-        return result;
-    }
-
-    @Nullable
-    @Override
-    public JSONObject getJSONStatus() {
-        if (activePump != null)
-            return activePump.getJSONStatus();
-        else return null;
-    }
-
-    @Override
-    public String deviceID() {
-        if (activePump != null)
-            return activePump.deviceID();
-        else return "No Pump active!";
-    }
-
-    @Override
-    public PumpDescription getPumpDescription() {
-        if (activePump != null)
-            return activePump.getPumpDescription();
-        else {
-            PumpDescription emptyDescription = new PumpDescription();
-            emptyDescription.isBolusCapable = false;
-            emptyDescription.isExtendedBolusCapable = false;
-            emptyDescription.isSetBasalProfileCapable = false;
-            emptyDescription.isTempBasalCapable = true; // needs to be true before real driver is selected
-            emptyDescription.isRefillingCapable = false;
-            return emptyDescription;
         }
     }
 
-    @Override
-    public String shortStatus(boolean veryShort) {
-        if (activePump != null) {
-            return activePump.shortStatus(veryShort);
-        } else {
-            return "No Pump active!";
-        }
-    }
-
-    @Override
-    public boolean isFakingTempsByExtendedBoluses() {
-        return activePump.isFakingTempsByExtendedBoluses();
-    }
 
     /**
      * Constraints interface
@@ -691,8 +468,7 @@ public class ConfigBuilderPlugin implements PluginBase, PumpInterface, Constrain
 
     @Override
     public boolean isAMAModeEnabled() {
-        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(MainApp.instance().getApplicationContext());
+        boolean result = SP.getBoolean("openapsama_useautosens", false);
-        boolean result = preferences.getBoolean("openapsama_useautosens", false);
 
         ArrayList<PluginBase> constraintsPlugins = MainApp.getSpecificPluginsListByInterface(ConstraintsInterface.class);
         for (PluginBase p : constraintsPlugins) {
@@ -703,6 +479,19 @@ public class ConfigBuilderPlugin implements PluginBase, PumpInterface, Constrain
         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;
@@ -822,13 +611,13 @@ public class ConfigBuilderPlugin implements PluginBase, PumpInterface, Constrain
 
     @Override
     public boolean isTempBasalInProgress() {
-        return activeTreatments.isTempBasalInProgress();
+        return activeTreatments != null && activeTreatments.isTempBasalInProgress();
     }
 
     @Override
     @Nullable
     public TemporaryBasal getTempBasalFromHistory(long time) {
-        return activeTreatments.getTempBasalFromHistory(time);
+        return activeTreatments != null ? activeTreatments.getTempBasalFromHistory(time) : null;
     }
 
     @Override
@@ -945,6 +734,10 @@ public class ConfigBuilderPlugin implements PluginBase, PumpInterface, Constrain
         return getProfileName(System.currentTimeMillis());
     }
 
+    public String getProfileName(boolean customized) {
+        return getProfileName(System.currentTimeMillis(), customized);
+    }
+
     public String getProfileName(long time) {
         return getProfileName(time, true);
     }
@@ -968,14 +761,17 @@ public class ConfigBuilderPlugin implements PluginBase, PumpInterface, Constrain
         return "Default";
     }
 
+    @Nullable
     public Profile getProfile() {
         return getProfile(System.currentTimeMillis());
     }
 
     public String getProfileUnits() {
-        return getProfile().getUnits();
+        Profile profile = getProfile();
+        return profile != null ? profile.getUnits() : Constants.MGDL;
     }
 
+    @Nullable
     public Profile getProfile(long time) {
         if (activeTreatments == null)
             return null; //app not initialized

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

@@ -197,6 +197,7 @@ public class ObjectivesFragment extends Fragment {
             ObjectivesPlugin.objectives.get(4).objective = MainApp.sResources.getString(R.string.objectives_4_objective);
             ObjectivesPlugin.objectives.get(5).objective = MainApp.sResources.getString(R.string.objectives_5_objective);
             ObjectivesPlugin.objectives.get(6).objective = MainApp.sResources.getString(R.string.objectives_6_objective);
+            ObjectivesPlugin.objectives.get(7).objective = MainApp.sResources.getString(R.string.objectives_7_objective);
             ObjectivesPlugin.objectives.get(0).gate = MainApp.sResources.getString(R.string.objectives_0_gate);
             ObjectivesPlugin.objectives.get(1).gate = MainApp.sResources.getString(R.string.objectives_1_gate);
             ObjectivesPlugin.objectives.get(2).gate = MainApp.sResources.getString(R.string.objectives_2_gate);

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;
 
 /**
@@ -72,12 +78,12 @@ public class ObjectivesPlugin implements PluginBase, ConstraintsInterface {
 
     @Override
     public boolean isEnabled(int type) {
-        return type == CONSTRAINTS && MainApp.getConfigBuilder().getPumpDescription().isTempBasalCapable;
+        return type == CONSTRAINTS && ConfigBuilderPlugin.getActivePump().getPumpDescription().isTempBasalCapable;
     }
 
     @Override
     public boolean isVisibleInTabs(int type) {
-        return type == CONSTRAINTS && fragmentVisible && !BuildConfig.NSCLIENTOLNY;
+        return type == CONSTRAINTS && fragmentVisible && !Config.NSCLIENT && !Config.G5UPLOADER;
     }
 
     @Override
@@ -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,14 +313,19 @@ 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)
+        if (objectives.get(3).started.getTime() > 0 && objectives.get(3).accomplished.getTime() == 0) {
-            return maxIob;
-        else {
             if (Config.logConstraintsChanges)
                 log.debug("Limiting maxIOB " + maxIob + " to " + 0 + "U");
             return 0d;
+        } else {
+            return maxIob;
         }
     }
 

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

@@ -10,9 +10,10 @@ 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.interfaces.ConstraintsInterface;
 import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.data.Profile;
+import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.utils.HardLimits;
 import info.nightscout.utils.Round;
 import info.nightscout.utils.SP;
@@ -93,7 +94,7 @@ public class SafetyPlugin implements PluginBase, ConstraintsInterface {
 
     @Override
     public boolean isLoopEnabled() {
-        return MainApp.getConfigBuilder().getPumpDescription().isTempBasalCapable;
+        return ConfigBuilderPlugin.getActivePump().getPumpDescription().isTempBasalCapable;
     }
 
     /**
@@ -115,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/Food/FoodFragment.java

@@ -61,7 +61,6 @@ public class FoodFragment extends SubscriberFragment {
                              Bundle savedInstanceState) {
         try {
             View view = inflater.inflate(R.layout.food_fragment, container, false);
-
             filter = (EditText) view.findViewById(R.id.food_filter);
             clearFilter = (ImageView) view.findViewById(R.id.food_clearfilter);
             category = new SpinnerHelper(view.findViewById(R.id.food_category));

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

@@ -1,13 +1,14 @@
 package info.nightscout.androidaps.plugins.Insulin;
 
-import info.nightscout.androidaps.Constants;
+import com.squareup.otto.Bus;
+
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Iob;
 import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.interfaces.InsulinInterface;
 import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 
 /**
@@ -45,38 +46,53 @@ public abstract class InsulinOrefBasePlugin implements PluginBase, InsulinInterf
         return true;
     }
 
+    public Bus getBus() {
+        return MainApp.bus();
+    }
+
     @Override
     public double getDia() {
         double dia = getUserDefinedDia();
         if(dia >= MIN_DIA){
             return dia;
         } else {
-            if((System.currentTimeMillis() - lastWarned) > 60*1000) {
+            sendShortDiaNotification(dia);
-                lastWarned = System.currentTimeMillis();
-                Notification notification = new Notification(Notification.SHORT_DIA, String.format(MainApp.sResources.getString(R.string.dia_too_short), dia, MIN_DIA), Notification.URGENT);
-                MainApp.bus().post(new EventNewNotification(notification));
-            }
             return MIN_DIA;
         }
     }
 
+    void sendShortDiaNotification(double dia) {
+        if((System.currentTimeMillis() - lastWarned) > 60*1000) {
+            lastWarned = System.currentTimeMillis();
+            Notification notification = new Notification(Notification.SHORT_DIA, String.format(this.getNotificationPattern(), dia, MIN_DIA), Notification.URGENT);
+            this.getBus().post(new EventNewNotification(notification));
+        }
+    }
+
+    public String getNotificationPattern() {
+        return MainApp.sResources.getString(R.string.dia_too_short);
+    }
+
     public double getUserDefinedDia() {
         return MainApp.getConfigBuilder().getProfile() != null ? MainApp.getConfigBuilder().getProfile().getDia() : MIN_DIA;
     }
 
+    public Iob iobCalcForTreatment(Treatment treatment, long time) {
+        return this.iobCalcForTreatment(treatment, time, 0d);
+    }
+
     @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();
 
-
         if (treatment.insulin != 0d) {
 
             long bolusTime = treatment.date;
             double t = (time - bolusTime) / 1000d / 60d;
 
-            double td = getDia()*60; //getDIA() always > 5
+            double td = getDia()*60; //getDIA() always >= MIN_DIA
             double tp = peak;
 
             // force the IOB to 0 if over DIA hours have passed

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

@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.plugins.IobCobCalculator;
 
-import android.os.Handler;
+import android.os.SystemClock;
-import android.os.HandlerThread;
 import android.support.annotation.Nullable;
 import android.support.v4.util.LongSparseArray;
 
@@ -23,16 +22,15 @@ import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.db.TemporaryBasal;
-import info.nightscout.androidaps.db.Treatment;
+import info.nightscout.androidaps.events.EventAppInitialized;
 import info.nightscout.androidaps.events.EventConfigBuilderChange;
 import info.nightscout.androidaps.events.EventNewBG;
 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;
+import info.nightscout.utils.DateUtil;
 
 /**
  * Created by mike on 24.04.2017.
@@ -50,10 +48,10 @@ public class IobCobCalculatorPlugin implements PluginBase {
 
     private static double dia = Constants.defaultDIA;
 
-    private static Handler sHandler = null;
+    static final Object dataLock = new Object();
-    private static HandlerThread sHandlerThread = null;
 
-    private static final Object dataLock = new Object();
+    boolean stopCalculationTrigger = false;
+    IobCobThread thread = null;
 
     private static IobCobCalculatorPlugin plugin = null;
 
@@ -133,12 +131,6 @@ public class IobCobCalculatorPlugin implements PluginBase {
 
     IobCobCalculatorPlugin() {
         MainApp.bus().register(this);
-        if (sHandlerThread == null) {
-            sHandlerThread = new HandlerThread(IobCobCalculatorPlugin.class.getSimpleName());
-            sHandlerThread.start();
-            sHandler = new Handler(sHandlerThread.getLooper());
-        }
-        onNewBg(new EventNewBG());
     }
 
     @Nullable
@@ -175,15 +167,10 @@ public class IobCobCalculatorPlugin implements PluginBase {
         return rouded;
     }
 
-    private void loadBgData() {
+    void loadBgData() {
-        //log.debug("Locking loadBgData");
-        synchronized (dataLock) {
-            onNewProfile(null);
         bgReadings = MainApp.getDbHelper().getBgreadingsDataFromTime((long) (System.currentTimeMillis() - 60 * 60 * 1000L * (24 + dia)), false);
         log.debug("BG data loaded. Size: " + bgReadings.size());
     }
-        //log.debug("Releasing loadBgData");
-    }
 
     private boolean isAbout5minData() {
         synchronized (dataLock) {
@@ -209,7 +196,7 @@ public class IobCobCalculatorPlugin implements PluginBase {
         }
     }
 
-    private void createBucketedData() {
+    void createBucketedData() {
         if (isAbout5minData())
             createBucketedData5min();
         else
@@ -241,7 +228,6 @@ public class IobCobCalculatorPlugin implements PluginBase {
     }
 
     private void createBucketedDataRecalculated() {
-        synchronized (dataLock) {
         if (bgReadings == null || bgReadings.size() < 3) {
             bucketed_data = null;
             return;
@@ -271,12 +257,9 @@ public class IobCobCalculatorPlugin implements PluginBase {
 
         }
     }
-    }
 
 
     public void createBucketedData5min() {
-        //log.debug("Locking createBucketedData");
-        synchronized (dataLock) {
         if (bgReadings == null || bgReadings.size() < 3) {
             bucketed_data = null;
             return;
@@ -337,126 +320,6 @@ public class IobCobCalculatorPlugin implements PluginBase {
         }
         log.debug("Bucketed data created. Size: " + bucketed_data.size());
     }
-        //log.debug("Releasing createBucketedData");
-    }
-
-    private void calculateSensitivityData() {
-        if (MainApp.getConfigBuilder() == null)
-            return; // app still initializing
-        if (MainApp.getConfigBuilder().getProfile() == null)
-            return; // app still initializing
-        //log.debug("Locking calculateSensitivityData");
-        long oldestTimeWithData = oldestDataAvailable();
-
-        synchronized (dataLock) {
-
-            if (bucketed_data == null || bucketed_data.size() < 3) {
-                log.debug("calculateSensitivityData: No bucketed data available");
-                return;
-            }
-
-            long prevDataTime = roundUpTime(bucketed_data.get(bucketed_data.size() - 3).date);
-            log.debug("Prev data time: " + new Date(prevDataTime).toLocaleString());
-            AutosensData previous = autosensDataTable.get(prevDataTime);
-            // start from oldest to be able sub cob
-            for (int i = bucketed_data.size() - 4; i >= 0; i--) {
-                // check if data already exists
-                long bgTime = bucketed_data.get(i).date;
-                bgTime = roundUpTime(bgTime);
-                Profile profile = MainApp.getConfigBuilder().getProfile(bgTime);
-
-                AutosensData existing;
-                if ((existing = autosensDataTable.get(bgTime)) != null) {
-                    previous = existing;
-                    continue;
-                }
-
-                if (profile.getIsf(bgTime) == null)
-                    return; // profile not set yet
-
-                double sens = Profile.toMgdl(profile.getIsf(bgTime), profile.getUnits());
-
-                AutosensData autosensData = new AutosensData();
-                autosensData.time = bgTime;
-                if (previous != null)
-                    autosensData.activeCarbsList = new ArrayList<>(previous.activeCarbsList);
-                else
-                    autosensData.activeCarbsList = new ArrayList<>();
-
-                //console.error(bgTime , bucketed_data[i].glucose);
-                double bg;
-                double avgDelta;
-                double delta;
-                bg = bucketed_data.get(i).value;
-                if (bg < 39 || bucketed_data.get(i + 3).value < 39) {
-                    log.error("! value < 39");
-                    continue;
-                }
-                delta = (bg - bucketed_data.get(i + 1).value);
-
-                IobTotal iob = calculateFromTreatmentsAndTemps(bgTime);
-
-                double bgi = -iob.activity * sens * 5;
-                double deviation = delta - bgi;
-
-                List<Treatment> recentTreatments = MainApp.getConfigBuilder().getTreatments5MinBackFromHistory(bgTime);
-                for (int ir = 0; ir < recentTreatments.size(); ir++) {
-                    autosensData.carbsFromBolus += recentTreatments.get(ir).carbs;
-                    autosensData.activeCarbsList.add(new AutosensData.CarbsInPast(recentTreatments.get(ir)));
-                }
-
-
-                // if we are absorbing carbs
-                if (previous != null && previous.cob > 0) {
-                    // calculate sum of min carb impact from all active treatments
-                    double totalMinCarbsImpact = 0d;
-                    for (int ii = 0; ii < autosensData.activeCarbsList.size(); ++ii) {
-                        AutosensData.CarbsInPast c = autosensData.activeCarbsList.get(ii);
-                        totalMinCarbsImpact += c.min5minCarbImpact;
-                    }
-
-                    // figure out how many carbs that represents
-                    // but always assume at least 3mg/dL/5m (default) absorption per active treatment
-                    double ci = Math.max(deviation, totalMinCarbsImpact);
-                    autosensData.absorbed = ci * profile.getIc(bgTime) / sens;
-                    // and add that to the running total carbsAbsorbed
-                    autosensData.cob = Math.max(previous.cob - autosensData.absorbed, 0d);
-                    autosensData.substractAbosorbedCarbs();
-                }
-                autosensData.removeOldCarbs(bgTime);
-                autosensData.cob += autosensData.carbsFromBolus;
-                autosensData.deviation = deviation;
-                autosensData.bgi = bgi;
-                autosensData.delta = delta;
-
-                // calculate autosens only without COB
-                if (autosensData.cob <= 0) {
-                    if (Math.abs(deviation) < Constants.DEVIATION_TO_BE_EQUAL) {
-                        autosensData.pastSensitivity += "=";
-                        autosensData.nonEqualDeviation = true;
-                    } else if (deviation > 0) {
-                        autosensData.pastSensitivity += "+";
-                        autosensData.nonEqualDeviation = true;
-                    } else {
-                        autosensData.pastSensitivity += "-";
-                        autosensData.nonEqualDeviation = true;
-                    }
-                    autosensData.nonCarbsDeviation = true;
-                } else {
-                    autosensData.pastSensitivity += "C";
-                }
-                //log.debug("TIME: " + new Date(bgTime).toString() + " BG: " + bg + " SENS: " + sens + " DELTA: " + delta + " AVGDELTA: " + avgDelta + " IOB: " + iob.iob + " ACTIVITY: " + iob.activity + " BGI: " + bgi + " DEVIATION: " + deviation);
-
-                previous = autosensData;
-                autosensDataTable.put(bgTime, autosensData);
-                autosensData.autosensRatio = detectSensitivity(oldestTimeWithData, bgTime).ratio;
-                if (Config.logAutosensData)
-                    log.debug(autosensData.log(bgTime));
-            }
-        }
-        MainApp.bus().post(new EventAutosensCalculationFinished());
-        //log.debug("Releasing calculateSensitivityData");
-    }
 
     public static long oldestDataAvailable() {
         long now = System.currentTimeMillis();
@@ -543,6 +406,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("getAutosensData");
+                }
                 //log.debug(">>> getAutosensData Cache miss " + new Date(time).toLocaleString());
                 return null;
             }
@@ -550,13 +417,35 @@ public class IobCobCalculatorPlugin implements PluginBase {
     }
 
     @Nullable
-    public static AutosensData getLastAutosensData() {
+    public static AutosensData getLastAutosensDataSynchronized(String reason) {
-        if (autosensDataTable.size() < 1)
+        synchronized (dataLock) {
+            return getLastAutosensData(reason);
+        }
+    }
+
+
+    @Nullable
+    public static AutosensData getLastAutosensData(String reason) {
+        if (autosensDataTable.size() < 1) {
+            log.debug("AUTOSENSDATA null: autosensDataTable empty (" + reason + ")");
             return null;
-        AutosensData data = autosensDataTable.valueAt(autosensDataTable.size() - 1);
+        }
-        if (data.time < System.currentTimeMillis() - 5 * 60 * 1000) {
+        AutosensData data = null;
+        try {
+            data = autosensDataTable.valueAt(autosensDataTable.size() - 1);
+        } catch (Exception e) {
+            // data can be processed on the background
+            // in this rare case better return null and do not block UI
+            // APS plugin should use getLastAutosensDataSynchronized where the blocking is not an issue
+            log.debug("AUTOSENSDATA null: Exception catched (" + reason + ")");
+            return null;
+        }
+        if (data.time < System.currentTimeMillis() - 11 * 60 * 1000) {
+            log.debug("AUTOSENSDATA null: data is old (" + reason + ") size()=" + autosensDataTable.size() + " lastdata=" + DateUtil.dateAndTimeString(data.time));
             return null;
         } else {
+            if (data == null)
+                log.debug("AUTOSENSDATA null: data == null (" + " " + reason + ") size()=" + autosensDataTable.size() + " lastdata=" + DateUtil.dateAndTimeString(data.time));
             return data;
         }
     }
@@ -584,7 +473,7 @@ public class IobCobCalculatorPlugin implements PluginBase {
         }
     }
 
-    private static AutosensResult detectSensitivity(long fromTime, long toTime) {
+    static AutosensResult detectSensitivity(long fromTime, long toTime) {
         return ConfigBuilderPlugin.getActiveSensitivity().detectSensitivity(fromTime, toTime);
     }
 
@@ -597,15 +486,33 @@ public class IobCobCalculatorPlugin implements PluginBase {
     }
 
     @Subscribe
-    public void onNewBg(EventNewBG ev) {
+    public void onEventAppInitialized(EventAppInitialized ev) {
-        sHandler.post(new Runnable() {
+        runCalculation("onEventAppInitialized", true);
-            @Override
+    }
-            public void run() {
+
-                loadBgData();
+    @Subscribe
-                createBucketedData();
+    public void onEventNewBG(EventNewBG ev) {
-                calculateSensitivityData();
+        stopCalculation("onEventNewBG");
+        runCalculation("onEventNewBG", true);
+    }
+
+    private void stopCalculation(String from) {
+        if (thread != null && thread.getState() != Thread.State.TERMINATED) {
+            stopCalculationTrigger = true;
+            log.debug("Stopping calculation thread: " + from);
+            while (thread.getState() != Thread.State.TERMINATED) {
+                SystemClock.sleep(100);
+            }
+            log.debug("Calculation thread stopped: " + from);
+        }
+    }
+
+    private void runCalculation(String from, boolean bgDataReload) {
+        log.debug("Starting calculation thread: " + from);
+        if (thread == null || thread.getState() == Thread.State.TERMINATED) {
+            thread = new IobCobThread(this, from, bgDataReload);
+            thread.start();
         }
-        });
     }
 
     @Subscribe
@@ -619,64 +526,53 @@ public class IobCobCalculatorPlugin implements PluginBase {
         if (ev == null) { // on init no need of reset
             return;
         }
+        stopCalculation("onNewProfile");
         synchronized (dataLock) {
             log.debug("Invalidating cached data because of new profile. IOB: " + iobTable.size() + " Autosens: " + autosensDataTable.size() + " records");
             iobTable = new LongSparseArray<>();
             autosensDataTable = new LongSparseArray<>();
         }
-        sHandler.post(new Runnable() {
+        runCalculation("onNewProfile", false);
-            @Override
-            public void run() {
-                calculateSensitivityData();
-            }
-        });
     }
 
     @Subscribe
-    public void onStatusEvent(EventPreferenceChange ev) {
+    public void onEventPreferenceChange(EventPreferenceChange ev) {
         if (ev.isChanged(R.string.key_openapsama_autosens_period) ||
                 ev.isChanged(R.string.key_age) ||
                 ev.isChanged(R.string.key_absorption_maxtime)
                 ) {
+            stopCalculation("onEventPreferenceChange");
             synchronized (dataLock) {
                 log.debug("Invalidating cached data because of preference change. IOB: " + iobTable.size() + " Autosens: " + autosensDataTable.size() + " records");
                 iobTable = new LongSparseArray<>();
                 autosensDataTable = new LongSparseArray<>();
             }
-            sHandler.post(new Runnable() {
+            runCalculation("onEventPreferenceChange", false);
-                @Override
-                public void run() {
-                    calculateSensitivityData();
-                }
-            });
         }
     }
 
     @Subscribe
-    public void onStatusEvent(EventConfigBuilderChange ev) {
+    public void onEventConfigBuilderChange(EventConfigBuilderChange ev) {
+        stopCalculation("onEventConfigBuilderChange");
         synchronized (dataLock) {
             log.debug("Invalidating cached data because of configuration change. IOB: " + iobTable.size() + " Autosens: " + autosensDataTable.size() + " records");
             iobTable = new LongSparseArray<>();
             autosensDataTable = new LongSparseArray<>();
         }
-        sHandler.post(new Runnable() {
+        runCalculation("onEventConfigBuilderChange", false);
-            @Override
-            public void run() {
-                calculateSensitivityData();
-            }
-        });
     }
 
     // When historical data is changed (comming from NS etc) finished calculations after this date must be invalidated
     @Subscribe
-    public void onNewHistoryData(EventNewHistoryData ev) {
+    public void onEventNewHistoryData(EventNewHistoryData ev) {
         //log.debug("Locking onNewHistoryData");
+        stopCalculation("onEventNewHistoryData");
         synchronized (dataLock) {
-            long time = ev.time;
+            // clear up 5 min back for proper COB calculation
+            long time = ev.time - 5 * 60 * 1000L;
             log.debug("Invalidating cached data to: " + new Date(time).toLocaleString());
             for (int index = iobTable.size() - 1; index >= 0; index--) {
                 if (iobTable.keyAt(index) > time) {
-                    if (Config.logAutosensData)
                     if (Config.logAutosensData)
                         log.debug("Removing from iobTable: " + new Date(iobTable.keyAt(index)).toLocaleString());
                     iobTable.removeAt(index);
@@ -703,12 +599,7 @@ public class IobCobCalculatorPlugin implements PluginBase {
                 }
             }
         }
-        sHandler.post(new Runnable() {
+        runCalculation("onEventNewHistoryData", false);
-            @Override
-            public void run() {
-                calculateSensitivityData();
-            }
-        });
         //log.debug("Releasing onNewHistoryData");
     }
 

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

@@ -0,0 +1,206 @@
+package info.nightscout.androidaps.plugins.IobCobCalculator;
+
+import android.content.Context;
+import android.os.PowerManager;
+import android.support.v4.util.LongSparseArray;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import info.nightscout.androidaps.Config;
+import info.nightscout.androidaps.Constants;
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.data.IobTotal;
+import info.nightscout.androidaps.data.Profile;
+import info.nightscout.androidaps.db.BgReading;
+import info.nightscout.androidaps.db.Treatment;
+import info.nightscout.androidaps.plugins.IobCobCalculator.events.EventAutosensCalculationFinished;
+import info.nightscout.androidaps.queue.QueueThread;
+
+import static info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin.getBucketedData;
+import static info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin.oldestDataAvailable;
+import static info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin.roundUpTime;
+
+/**
+ * Created by mike on 23.01.2018.
+ */
+
+public class IobCobThread extends Thread {
+    private static Logger log = LoggerFactory.getLogger(QueueThread.class);
+
+    private IobCobCalculatorPlugin iobCobCalculatorPlugin;
+    private boolean bgDataReload;
+    private String from;
+
+    private PowerManager.WakeLock mWakeLock;
+
+    public IobCobThread(IobCobCalculatorPlugin plugin, String from, boolean bgDataReload) {
+        super();
+
+        this.iobCobCalculatorPlugin = plugin;
+        this.bgDataReload = bgDataReload;
+        this.from = from;
+
+        PowerManager powerManager = (PowerManager) MainApp.instance().getApplicationContext().getSystemService(Context.POWER_SERVICE);
+        mWakeLock = powerManager.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK, "iobCobThread");
+    }
+
+    @Override
+    public final void run() {
+        mWakeLock.acquire();
+        try {
+            if (MainApp.getConfigBuilder() == null) {
+                log.debug("Aborting calculation thread (ConfigBuilder not ready): " + from);
+                return; // app still initializing
+            }
+            if (MainApp.getConfigBuilder().getProfile() == null) {
+                log.debug("Aborting calculation thread (No profile): " + from);
+                return; // app still initializing
+            }
+            //log.debug("Locking calculateSensitivityData");
+
+            Object dataLock = iobCobCalculatorPlugin.dataLock;
+
+            long oldestTimeWithData = oldestDataAvailable();
+
+            synchronized (dataLock) {
+                if (bgDataReload) {
+                    iobCobCalculatorPlugin.loadBgData();
+                    iobCobCalculatorPlugin.createBucketedData();
+                }
+                List<BgReading> bucketed_data = getBucketedData();
+                LongSparseArray<AutosensData> autosensDataTable = iobCobCalculatorPlugin.getAutosensDataTable();
+
+                if (bucketed_data == null || bucketed_data.size() < 3) {
+                    log.debug("Aborting calculation thread (No bucketed data available): " + from);
+                    return;
+                }
+
+                long prevDataTime = roundUpTime(bucketed_data.get(bucketed_data.size() - 3).date);
+                log.debug("Prev data time: " + new Date(prevDataTime).toLocaleString());
+                AutosensData previous = autosensDataTable.get(prevDataTime);
+                // start from oldest to be able sub cob
+                for (int i = bucketed_data.size() - 4; i >= 0; i--) {
+                    if (iobCobCalculatorPlugin.stopCalculationTrigger) {
+                        iobCobCalculatorPlugin.stopCalculationTrigger = false;
+                        log.debug("Aborting calculation thread (trigger): " + from);
+                        return;
+                    }
+                    // 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;
+                    if ((existing = autosensDataTable.get(bgTime)) != null) {
+                        previous = existing;
+                        continue;
+                    }
+
+                    if (profile == null) {
+                        log.debug("Aborting calculation thread (no profile): " + from);
+                        return; // profile not set yet
+                    }
+
+                    if (profile.getIsf(bgTime) == null) {
+                        log.debug("Aborting calculation thread (no ISF): " + from);
+                        return; // profile not set yet
+                    }
+
+                    if (Config.logAutosensData)
+                        log.debug("Processing calculation thread: " + from + " (" + i + "/" + bucketed_data.size() + ")");
+
+                    double sens = Profile.toMgdl(profile.getIsf(bgTime), profile.getUnits());
+
+                    AutosensData autosensData = new AutosensData();
+                    autosensData.time = bgTime;
+                    if (previous != null)
+                        autosensData.activeCarbsList = new ArrayList<>(previous.activeCarbsList);
+                    else
+                        autosensData.activeCarbsList = new ArrayList<>();
+
+                    //console.error(bgTime , bucketed_data[i].glucose);
+                    double bg;
+                    double avgDelta;
+                    double delta;
+                    bg = bucketed_data.get(i).value;
+                    if (bg < 39 || bucketed_data.get(i + 3).value < 39) {
+                        log.error("! value < 39");
+                        continue;
+                    }
+                    delta = (bg - bucketed_data.get(i + 1).value);
+
+                    IobTotal iob = iobCobCalculatorPlugin.calculateFromTreatmentsAndTemps(bgTime);
+
+                    double bgi = -iob.activity * sens * 5;
+                    double deviation = delta - bgi;
+
+                    List<Treatment> recentTreatments = MainApp.getConfigBuilder().getTreatments5MinBackFromHistory(bgTime);
+                    for (int ir = 0; ir < recentTreatments.size(); ir++) {
+                        autosensData.carbsFromBolus += recentTreatments.get(ir).carbs;
+                        autosensData.activeCarbsList.add(new AutosensData.CarbsInPast(recentTreatments.get(ir)));
+                    }
+
+
+                    // if we are absorbing carbs
+                    if (previous != null && previous.cob > 0) {
+                        // calculate sum of min carb impact from all active treatments
+                        double totalMinCarbsImpact = 0d;
+                        for (int ii = 0; ii < autosensData.activeCarbsList.size(); ++ii) {
+                            AutosensData.CarbsInPast c = autosensData.activeCarbsList.get(ii);
+                            totalMinCarbsImpact += c.min5minCarbImpact;
+                        }
+
+                        // figure out how many carbs that represents
+                        // but always assume at least 3mg/dL/5m (default) absorption per active treatment
+                        double ci = Math.max(deviation, totalMinCarbsImpact);
+                        autosensData.absorbed = ci * profile.getIc(bgTime) / sens;
+                        // and add that to the running total carbsAbsorbed
+                        autosensData.cob = Math.max(previous.cob - autosensData.absorbed, 0d);
+                        autosensData.substractAbosorbedCarbs();
+                    }
+                    autosensData.removeOldCarbs(bgTime);
+                    autosensData.cob += autosensData.carbsFromBolus;
+                    autosensData.deviation = deviation;
+                    autosensData.bgi = bgi;
+                    autosensData.delta = delta;
+
+                    // calculate autosens only without COB
+                    if (autosensData.cob <= 0) {
+                        if (Math.abs(deviation) < Constants.DEVIATION_TO_BE_EQUAL) {
+                            autosensData.pastSensitivity += "=";
+                            autosensData.nonEqualDeviation = true;
+                        } else if (deviation > 0) {
+                            autosensData.pastSensitivity += "+";
+                            autosensData.nonEqualDeviation = true;
+                        } else {
+                            autosensData.pastSensitivity += "-";
+                            autosensData.nonEqualDeviation = true;
+                        }
+                        autosensData.nonCarbsDeviation = true;
+                    } else {
+                        autosensData.pastSensitivity += "C";
+                    }
+                    //log.debug("TIME: " + new Date(bgTime).toString() + " BG: " + bg + " SENS: " + sens + " DELTA: " + delta + " AVGDELTA: " + avgDelta + " IOB: " + iob.iob + " ACTIVITY: " + iob.activity + " BGI: " + bgi + " DEVIATION: " + deviation);
+
+                    previous = autosensData;
+                    autosensDataTable.put(bgTime, autosensData);
+                    autosensData.autosensRatio = iobCobCalculatorPlugin.detectSensitivity(oldestTimeWithData, bgTime).ratio;
+                    if (Config.logAutosensData)
+                        log.debug(autosensData.log(bgTime));
+                }
+            }
+            MainApp.bus().post(new EventAutosensCalculationFinished());
+            log.debug("Finishing calculation thread: " + from);
+        } finally {
+            mWakeLock.release();
+        }
+    }
+
+}

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

@@ -12,6 +12,7 @@ import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.utils.DecimalFormatter;
 
@@ -25,15 +26,16 @@ public class APSResult {
     public double rate;
     public int duration;
     public boolean changeRequested = false;
+
     @Override
     public String toString() {
-        final ConfigBuilderPlugin configBuilder = MainApp.getConfigBuilder();
+        final PumpInterface pump = ConfigBuilderPlugin.getActivePump();
         if (changeRequested) {
             if (rate == 0 && duration == 0)
                 return MainApp.sResources.getString(R.string.canceltemp);
             else
                 return MainApp.sResources.getString(R.string.rate) + ": " + DecimalFormatter.to2Decimal(rate) + " U/h " +
-                        "(" + DecimalFormatter.to2Decimal(rate/configBuilder.getBaseBasalRate() *100) + "%)\n" +
+                        "(" + DecimalFormatter.to2Decimal(rate / pump.getBaseBasalRate() * 100) + "%)\n" +
                         MainApp.sResources.getString(R.string.duration) + ": " + DecimalFormatter.to0Decimal(duration) + " min\n" +
                         MainApp.sResources.getString(R.string.reason) + ": " + reason;
         } else
@@ -41,13 +43,13 @@ public class APSResult {
     }
 
     public Spanned toSpanned() {
-        final ConfigBuilderPlugin configBuilder = MainApp.getConfigBuilder();
+        final PumpInterface pump = ConfigBuilderPlugin.getActivePump();
         if (changeRequested) {
             String ret = "";
             if (rate == 0 && duration == 0) ret = MainApp.sResources.getString(R.string.canceltemp);
             else
                 ret = "<b>" + MainApp.sResources.getString(R.string.rate) + "</b>: " + DecimalFormatter.to2Decimal(rate) + " U/h " +
-                        "(" + DecimalFormatter.to2Decimal(rate/configBuilder.getBaseBasalRate() *100) + "%) <br>" +
+                        "(" + DecimalFormatter.to2Decimal(rate / pump.getBaseBasalRate() * 100) + "%) <br>" +
                         "<b>" + MainApp.sResources.getString(R.string.duration) + "</b>: " + DecimalFormatter.to2Decimal(duration) + " min<br>" +
                         "<b>" + MainApp.sResources.getString(R.string.reason) + "</b>: " + reason.replace("<", "&lt;").replace(">", "&gt;");
             return Html.fromHtml(ret);

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

@@ -6,15 +6,12 @@ import android.app.PendingIntent;
 import android.app.TaskStackBuilder;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Handler;
+import android.support.v4.app.NotificationCompat;
-import android.os.HandlerThread;
-import android.support.v7.app.NotificationCompat;
 
 import com.crashlytics.android.answers.Answers;
 import com.crashlytics.android.answers.CustomEvent;
 import com.squareup.otto.Subscribe;
 
-import org.json.JSONException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,14 +28,14 @@ import info.nightscout.androidaps.events.EventTreatmentChange;
 import info.nightscout.androidaps.interfaces.APSInterface;
 import info.nightscout.androidaps.interfaces.ConstraintsInterface;
 import info.nightscout.androidaps.interfaces.PluginBase;
+import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Loop.events.EventLoopSetLastRunGui;
 import info.nightscout.androidaps.plugins.Loop.events.EventLoopUpdateGui;
 import info.nightscout.androidaps.plugins.Loop.events.EventNewOpenLoopNotification;
-import info.nightscout.androidaps.plugins.OpenAPSAMA.OpenAPSAMAPlugin;
+import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.utils.NSUpload;
 import info.nightscout.utils.SP;
-import info.nightscout.utils.SafeParse;
 
 /**
  * Created by mike on 05.08.2016.
@@ -55,14 +52,12 @@ public class LoopPlugin implements PluginBase {
         return loopPlugin;
     }
 
-    private static Handler sHandler;
-    private static HandlerThread sHandlerThread;
-
     private boolean fragmentEnabled = false;
     private boolean fragmentVisible = false;
 
     private long loopSuspendedTill = 0L; // end of manual loop suspend
     private boolean isSuperBolus = false;
+    private boolean isDisconnected = false;
 
     public class LastRun {
         public APSResult request = null;
@@ -77,14 +72,10 @@ public class LoopPlugin implements PluginBase {
     static public LastRun lastRun = null;
 
     public LoopPlugin() {
-        if (sHandlerThread == null) {
-            sHandlerThread = new HandlerThread(LoopPlugin.class.getSimpleName());
-            sHandlerThread.start();
-            sHandler = new Handler(sHandlerThread.getLooper());
-        }
         MainApp.bus().register(this);
         loopSuspendedTill = SP.getLong("loopSuspendedTill", 0L);
         isSuperBolus = SP.getBoolean("isSuperBolus", false);
+        isDisconnected = SP.getBoolean("isDisconnected", false);
     }
 
     @Override
@@ -115,12 +106,14 @@ public class LoopPlugin implements PluginBase {
 
     @Override
     public boolean isEnabled(int type) {
-        return type == LOOP && fragmentEnabled && MainApp.getConfigBuilder().getPumpDescription().isTempBasalCapable;
+        boolean pumpCapable = ConfigBuilderPlugin.getActivePump() == null || ConfigBuilderPlugin.getActivePump().getPumpDescription().isTempBasalCapable;
+        return type == LOOP && fragmentEnabled && pumpCapable;
     }
 
     @Override
     public boolean isVisibleInTabs(int type) {
-        return type == LOOP && fragmentVisible && MainApp.getConfigBuilder().getPumpDescription().isTempBasalCapable;
+        boolean pumpCapable = ConfigBuilderPlugin.getActivePump() == null || ConfigBuilderPlugin.getActivePump().getPumpDescription().isTempBasalCapable;
+        return type == LOOP && fragmentVisible && pumpCapable;
     }
 
     @Override
@@ -170,13 +163,28 @@ public class LoopPlugin implements PluginBase {
     public void suspendTo(long endTime) {
         loopSuspendedTill = endTime;
         isSuperBolus = false;
+        isDisconnected = false;
         SP.putLong("loopSuspendedTill", loopSuspendedTill);
+        SP.putBoolean("isSuperBolus", isSuperBolus);
+        SP.putBoolean("isDisconnected", isDisconnected);
     }
 
     public void superBolusTo(long endTime) {
         loopSuspendedTill = endTime;
         isSuperBolus = true;
+        isDisconnected = false;
         SP.putLong("loopSuspendedTill", loopSuspendedTill);
+        SP.putBoolean("isSuperBolus", isSuperBolus);
+        SP.putBoolean("isDisconnected", isDisconnected);
+    }
+
+    public void disconnectTo(long endTime) {
+        loopSuspendedTill = endTime;
+        isSuperBolus = false;
+        isDisconnected = true;
+        SP.putLong("loopSuspendedTill", loopSuspendedTill);
+        SP.putBoolean("isSuperBolus", isSuperBolus);
+        SP.putBoolean("isDisconnected", isDisconnected);
     }
 
     public int minutesToEndOfSuspend() {
@@ -222,6 +230,19 @@ public class LoopPlugin implements PluginBase {
         return isSuperBolus;
     }
 
+    public boolean isDisconnected() {
+        if (loopSuspendedTill == 0)
+            return false;
+
+        long now = System.currentTimeMillis();
+
+        if (loopSuspendedTill <= now) { // time exceeded
+            suspendTo(0L);
+            return false;
+        }
+        return isDisconnected;
+    }
+
     public void invoke(String initiator, boolean allowNotification) {
         try {
             if (Config.logFunctionCalls)
@@ -232,34 +253,22 @@ public class LoopPlugin implements PluginBase {
                 MainApp.bus().post(new EventLoopSetLastRunGui(MainApp.sResources.getString(R.string.loopdisabled)));
                 return;
             }
-            final ConfigBuilderPlugin configBuilder = MainApp.getConfigBuilder();
+            final PumpInterface pump = ConfigBuilderPlugin.getActivePump();
             APSResult result = null;
 
-            if (configBuilder == null || !isEnabled(PluginBase.LOOP))
+            if (!isEnabled(PluginBase.LOOP))
                 return;
 
-            if (isSuspended()) {
+            if (MainApp.getConfigBuilder().getProfile() == null) {
-                log.debug(MainApp.sResources.getString(R.string.loopsuspended));
-                MainApp.bus().post(new EventLoopSetLastRunGui(MainApp.sResources.getString(R.string.loopsuspended)));
-                return;
-            }
-
-            if (configBuilder.isSuspended()) {
-                log.debug(MainApp.sResources.getString(R.string.pumpsuspended));
-                MainApp.bus().post(new EventLoopSetLastRunGui(MainApp.sResources.getString(R.string.pumpsuspended)));
-                return;
-            }
-
-            if (configBuilder.getProfile() == null) {
                 log.debug(MainApp.sResources.getString(R.string.noprofileselected));
                 MainApp.bus().post(new EventLoopSetLastRunGui(MainApp.sResources.getString(R.string.noprofileselected)));
                 return;
             }
 
             // Check if pump info is loaded
-            if (configBuilder.getBaseBasalRate() < 0.01d) return;
+            if (pump.getBaseBasalRate() < 0.01d) return;
 
-            APSInterface usedAPS = configBuilder.getActiveAPS();
+            APSInterface usedAPS = ConfigBuilderPlugin.getActiveAPS();
             if (usedAPS != null && ((PluginBase) usedAPS).isEnabled(PluginBase.APS)) {
                 usedAPS.invoke(initiator);
                 result = usedAPS.getLastAPSResult();
@@ -282,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();
@@ -289,13 +312,12 @@ public class LoopPlugin implements PluginBase {
                     waiting.queued = true;
                     lastRun.setByPump = waiting;
                     MainApp.bus().post(new EventLoopUpdateGui());
-                    sHandler.post(new Runnable() {
+                    MainApp.getConfigBuilder().applyAPSRequest(resultAfterConstraints, new Callback() {
                         @Override
                         public void run() {
-                            final PumpEnactResult applyResult = configBuilder.applyAPSRequest(resultAfterConstraints);
                             Answers.getInstance().logCustom(new CustomEvent("APSRequest"));
-                            if (applyResult.enacted || applyResult.success) {
+                            if (result.enacted || result.success) {
-                                lastRun.setByPump = applyResult;
+                                lastRun.setByPump = result;
                                 lastRun.lastEnact = lastRun.lastAPSRun;
                             } else {
                                 lastRun.setByPump = previousResult;
@@ -343,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

@@ -122,7 +122,7 @@ public class NSClientInternalPlugin implements PluginBase {
 
     @Override
     public boolean showInList(int type) {
-        return !Config.NSCLIENT;
+        return !Config.NSCLIENT && !Config.G5UPLOADER;
     }
 
     @Override
@@ -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/NSDeviceStatus.java

@@ -308,6 +308,15 @@ public class NSDeviceStatus {
         return Html.fromHtml(string.toString());
     }
 
+    public static long getOpenApsTimestamp() {
+
+        if (deviceStatusOpenAPSData.clockSuggested != 0) {
+            return deviceStatusOpenAPSData.clockSuggested;
+        } else {
+            return -1;
+        }
+    }
+
     public Spanned getExtendedOpenApsStatus() {
         StringBuilder string = new StringBuilder();
 

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.broadcasts.BroadcastTreatment;
-import info.nightscout.androidaps.plugins.NSClientInternal.data.AlarmAck;
+import info.nightscout.utils.DateUtil;
-import info.nightscout.androidaps.plugins.NSClientInternal.services.NSClientService;
 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,28 @@ public class DBAccessReceiver extends BroadcastReceiver {
             }
 
             if (action.equals("dbRemove")) {
+                if (shouldUpload()) {
                     DbRequest dbr = new DbRequest(action, collection, nsclientid.toString(), _id);
                     UploadQueue.add(dbr);
+                }
+            } else  if (action.equals("dbUpdate")) {
+                if (shouldUpload()) {
+                    DbRequest dbr = new DbRequest(action, collection, nsclientid.toString(), _id, data);
+                    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 +104,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.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")) {
@@ -632,6 +650,13 @@ public class NSClientService extends Service {
                                         if (sgv.getMills() > latestDateInReceivedData)
                                             latestDateInReceivedData = sgv.getMills();
                                 }
+                                // Was that sgv more less 15 mins ago ?
+                                boolean lessThan15MinAgo = false;
+                                if ((System.currentTimeMillis() - latestDateInReceivedData) / (60 * 1000L) < 15L)
+                                    lessThan15MinAgo = true;
+                                if (Notification.isAlarmForStaleData() && lessThan15MinAgo) {
+                                    MainApp.bus().post(new EventDismissNotification(Notification.NSALARM));
+                                }
                                 BroadcastSgvs.handleNewSgv(sgvs, MainApp.instance().getApplicationContext(), isDelta);
                             }
                             MainApp.bus().post(new EventNSClientNewLog("LAST", DateUtil.dateAndTimeString(latestDateInReceivedData)));

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

@@ -17,7 +17,6 @@ import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
-import java.util.Date;
 
 import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.Constants;
@@ -25,11 +24,10 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.data.GlucoseStatus;
 import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.MealData;
+import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.db.TemporaryBasal;
-import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.plugins.Loop.ScriptReader;
-import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.plugins.OpenAPSMA.LoggerCallback;
 import info.nightscout.utils.SP;
 
@@ -186,7 +184,7 @@ public class DetermineBasalAdapterAMAJS {
                         double minBg,
                         double maxBg,
                         double targetBg,
-                        PumpInterface pump,
+                        double basalrate,
                         IobTotal[] iobArray,
                         GlucoseStatus glucoseStatus,
                         MealData mealData,
@@ -210,7 +208,7 @@ public class DetermineBasalAdapterAMAJS {
         mProfile.put("max_daily_safety_multiplier", SP.getInt("openapsama_max_daily_safety_multiplier", 3));
         mProfile.put("current_basal_safety_multiplier", SP.getInt("openapsama_current_basal_safety_multiplier", 4));
         mProfile.put("skip_neutral_temps", true);
-        mProfile.put("current_basal", pump.getBaseBasalRate());
+        mProfile.put("current_basal", basalrate);
         mProfile.put("temptargetSet", tempTargetSet);
         mProfile.put("autosens_adjust_targets", SP.getBoolean("openapsama_autosens_adjusttargets", true));
         mProfile.put("min_5m_carbimpact", SP.getDouble("openapsama_min_5m_carbimpact", 3d));

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

@@ -14,15 +14,15 @@ import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.GlucoseStatus;
 import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.MealData;
+import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.db.TempTarget;
 import info.nightscout.androidaps.interfaces.APSInterface;
 import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PumpInterface;
+import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.IobCobCalculator.AutosensResult;
 import info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.plugins.Loop.APSResult;
 import info.nightscout.androidaps.plugins.Loop.ScriptReader;
-import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.plugins.OpenAPSMA.events.EventOpenAPSUpdateGui;
 import info.nightscout.androidaps.plugins.OpenAPSMA.events.EventOpenAPSUpdateResultGui;
 import info.nightscout.utils.DateUtil;
@@ -75,12 +75,14 @@ public class OpenAPSAMAPlugin implements PluginBase, APSInterface {
 
     @Override
     public boolean isEnabled(int type) {
-        return type == APS && fragmentEnabled && MainApp.getConfigBuilder().getPumpDescription().isTempBasalCapable;
+        boolean pumpCapable = ConfigBuilderPlugin.getActivePump() == null || ConfigBuilderPlugin.getActivePump().getPumpDescription().isTempBasalCapable;
+        return type == APS && fragmentEnabled && pumpCapable;
     }
 
     @Override
     public boolean isVisibleInTabs(int type) {
-        return type == APS && fragmentVisible && MainApp.getConfigBuilder().getPumpDescription().isTempBasalCapable;
+        boolean pumpCapable = ConfigBuilderPlugin.getActivePump() == null || ConfigBuilderPlugin.getActivePump().getPumpDescription().isTempBasalCapable;
+        return type == APS && fragmentVisible && pumpCapable;
     }
 
     @Override
@@ -137,7 +139,7 @@ public class OpenAPSAMAPlugin implements PluginBase, APSInterface {
     public void invoke(String initiator) {
         log.debug("invoke from " + initiator);
         lastAPSResult = null;
-        DetermineBasalAdapterAMAJS determineBasalAdapterAMAJS = null;
+        DetermineBasalAdapterAMAJS determineBasalAdapterAMAJS;
         try {
             determineBasalAdapterAMAJS = new DetermineBasalAdapterAMAJS(new ScriptReader(MainApp.instance().getBaseContext()));
         } catch (IOException e) {
@@ -147,7 +149,6 @@ public class OpenAPSAMAPlugin implements PluginBase, APSInterface {
 
         GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
         Profile profile = MainApp.getConfigBuilder().getProfile();
-        PumpInterface pump = MainApp.getConfigBuilder();
 
         if (profile == null) {
             MainApp.bus().post(new EventOpenAPSUpdateResultGui(MainApp.instance().getString(R.string.noprofileselected)));
@@ -215,7 +216,8 @@ public class OpenAPSAMAPlugin implements PluginBase, APSInterface {
         if (!checkOnlyHardLimits(Profile.toMgdl(profile.getIsf(), units), "sens", 2, 900))
             return;
         if (!checkOnlyHardLimits(profile.getMaxDailyBasal(), "max_daily_basal", 0.1, 10)) return;
-        if (!checkOnlyHardLimits(pump.getBaseBasalRate(), "current_basal", 0.01, 5)) return;
+        if (!checkOnlyHardLimits(ConfigBuilderPlugin.getActivePump().getBaseBasalRate(), "current_basal", 0.01, 5))
+            return;
 
         startPart = new Date();
         if (MainApp.getConfigBuilder().isAMAModeEnabled()) {
@@ -229,7 +231,7 @@ public class OpenAPSAMAPlugin implements PluginBase, APSInterface {
         start = new Date();
 
         try {
-            determineBasalAdapterAMAJS.setData(profile, maxIob, maxBasal, minBg, maxBg, targetBg, pump, iobArray, glucoseStatus, mealData,
+            determineBasalAdapterAMAJS.setData(profile, maxIob, maxBasal, minBg, maxBg, targetBg, ConfigBuilderPlugin.getActivePump().getBaseBasalRate(), iobArray, glucoseStatus, mealData,
                     lastAutosensResult.ratio, //autosensDataRatio
                     isTempTarget,
                     SafeParse.stringToDouble(SP.getString("openapsama_min_5m_carbimpact", "3.0"))//min_5m_carbimpact
@@ -246,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 - MainApp.getConfigBuilder().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/DetermineBasalAdapterMAJS.java

@@ -22,9 +22,8 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.data.GlucoseStatus;
 import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.MealData;
-import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.plugins.Loop.ScriptReader;
 import info.nightscout.androidaps.data.Profile;
+import info.nightscout.androidaps.plugins.Loop.ScriptReader;
 import info.nightscout.utils.SP;
 
 public class DetermineBasalAdapterMAJS {
@@ -155,7 +154,7 @@ public class DetermineBasalAdapterMAJS {
                         double minBg,
                         double maxBg,
                         double targetBg,
-                        PumpInterface pump,
+                        double basalRate,
                         IobTotal iobData,
                         GlucoseStatus glucoseStatus,
                         MealData mealData) throws JSONException {
@@ -174,7 +173,7 @@ public class DetermineBasalAdapterMAJS {
         mProfile.put("carb_ratio", profile.getIc());
         mProfile.put("sens", Profile.toMgdl(profile.getIsf().doubleValue(), units));
 
-        mProfile.put("current_basal", pump.getBaseBasalRate());
+        mProfile.put("current_basal", basalRate);
 
         if (units.equals(Constants.MMOL)) {
             mProfile.put("out_units", "mmol/L");

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

@@ -14,13 +14,13 @@ import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.GlucoseStatus;
 import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.MealData;
+import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.db.TempTarget;
 import info.nightscout.androidaps.interfaces.APSInterface;
 import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PumpInterface;
+import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Loop.APSResult;
 import info.nightscout.androidaps.plugins.Loop.ScriptReader;
-import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.plugins.OpenAPSMA.events.EventOpenAPSUpdateGui;
 import info.nightscout.androidaps.plugins.OpenAPSMA.events.EventOpenAPSUpdateResultGui;
 import info.nightscout.utils.DateUtil;
@@ -73,12 +73,14 @@ public class OpenAPSMAPlugin implements PluginBase, APSInterface {
 
     @Override
     public boolean isEnabled(int type) {
-        return type == APS && fragmentEnabled && MainApp.getConfigBuilder().getPumpDescription().isTempBasalCapable;
+        boolean pumpCapable = ConfigBuilderPlugin.getActivePump() == null || ConfigBuilderPlugin.getActivePump().getPumpDescription().isTempBasalCapable;
+        return type == APS && fragmentEnabled && pumpCapable;
     }
 
     @Override
     public boolean isVisibleInTabs(int type) {
-        return type == APS && fragmentVisible && MainApp.getConfigBuilder().getPumpDescription().isTempBasalCapable;
+        boolean pumpCapable = ConfigBuilderPlugin.getActivePump() == null || ConfigBuilderPlugin.getActivePump().getPumpDescription().isTempBasalCapable;
+        return type == APS && fragmentVisible && pumpCapable;
     }
 
     @Override
@@ -145,7 +147,6 @@ public class OpenAPSMAPlugin implements PluginBase, APSInterface {
 
         GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
         Profile profile = MainApp.getConfigBuilder().getProfile();
-        PumpInterface pump = MainApp.getConfigBuilder();
 
         if (profile == null) {
             MainApp.bus().post(new EventOpenAPSUpdateResultGui(MainApp.instance().getString(R.string.noprofileselected)));
@@ -213,11 +214,12 @@ public class OpenAPSMAPlugin implements PluginBase, APSInterface {
         if (!checkOnlyHardLimits(Profile.toMgdl(profile.getIsf(), units), "sens", 2, 900))
             return;
         if (!checkOnlyHardLimits(profile.getMaxDailyBasal(), "max_daily_basal", 0.1, 10)) return;
-        if (!checkOnlyHardLimits(pump.getBaseBasalRate(), "current_basal", 0.01, 5)) return;
+        if (!checkOnlyHardLimits(ConfigBuilderPlugin.getActivePump().getBaseBasalRate(), "current_basal", 0.01, 5))
+            return;
 
         start = new Date();
         try {
-            determineBasalAdapterMAJS.setData(profile, maxIob, maxBasal, minBg, maxBg, targetBg, pump, iobTotal, glucoseStatus, mealData);
+            determineBasalAdapterMAJS.setData(profile, maxIob, maxBasal, minBg, maxBg, targetBg, ConfigBuilderPlugin.getActivePump().getBaseBasalRate(), iobTotal, glucoseStatus, mealData);
         } catch (JSONException e) {
             log.error("Unhandled exception", e);
         }
@@ -230,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 - MainApp.getConfigBuilder().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/BolusProgressDialog.java

@@ -20,7 +20,7 @@ import org.slf4j.LoggerFactory;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
-import info.nightscout.androidaps.interfaces.PumpInterface;
+import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissBolusprogressIfRunning;
 import info.nightscout.androidaps.plugins.Overview.events.EventOverviewBolusProgress;
 
@@ -35,6 +35,7 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
     static double amount;
     public static boolean bolusEnded = false;
     public static boolean running = true;
+    public static boolean stopPressed = false;
 
     public BolusProgressDialog() {
         super();
@@ -62,6 +63,7 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
         progressBar.setMax(100);
         statusView.setText(MainApp.sResources.getString(R.string.waitingforpump));
         setCancelable(false);
+        stopPressed = false;
         return view;
     }
 
@@ -95,10 +97,10 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
         switch (view.getId()) {
             case R.id.overview_bolusprogress_stop:
                 log.debug("Stop bolus delivery button pressed");
+                stopPressed = true;
                 stopPressedView.setVisibility(View.VISIBLE);
                 stopButton.setVisibility(View.INVISIBLE);
-                PumpInterface pump = MainApp.getConfigBuilder();
+                ConfigBuilderPlugin.getActivePump().stopBolusDelivering();
-                pump.stopBolusDelivering();
                 break;
         }
     }

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);
+        useBGSpinner = (Spinner) view.findViewById(R.id.overview_editquickwizard_usebg_spinner);
-        okButton.setOnClickListener(this);
+        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/ErrorDialog.java

@@ -0,0 +1,94 @@
+package info.nightscout.androidaps.plugins.Overview.Dialogs;
+
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.Services.AlarmSoundService;
+
+public class ErrorDialog extends DialogFragment implements View.OnClickListener {
+    private static Logger log = LoggerFactory.getLogger(ErrorDialog.class);
+    Button okButton;
+    TextView statusView;
+    ErrorHelperActivity helperActivity;
+
+    static String status;
+    static String title;
+    static int soundId;
+
+    public ErrorDialog() {
+        super();
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public void setSound(int soundId) {
+        this.soundId = soundId;
+    }
+
+    public void setHelperActivity(ErrorHelperActivity activity) {
+        this.helperActivity = activity;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        getDialog().setTitle(title);
+        View view = inflater.inflate(R.layout.overview_error_dialog, container, false);
+        okButton = (Button) view.findViewById(R.id.overview_error_ok);
+        statusView = (TextView) view.findViewById(R.id.overview_error_status);
+        okButton.setOnClickListener(this);
+        setCancelable(false);
+
+        Intent alarm = new Intent(MainApp.instance().getApplicationContext(), AlarmSoundService.class);
+        alarm.putExtra("soundid", soundId);
+        MainApp.instance().startService(alarm);
+        return view;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (getDialog() != null)
+            getDialog().getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        statusView.setText(status);
+    }
+
+    @Override
+    public void dismiss() {
+        super.dismiss();
+        if (helperActivity != null) {
+            helperActivity.finish();
+        }
+        Intent alarm = new Intent(MainApp.instance().getApplicationContext(), AlarmSoundService.class);
+        MainApp.instance().stopService(alarm);
+    }
+
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.overview_error_ok:
+                log.debug("Error dialog ok button pressed");
+                dismiss();
+                break;
+        }
+    }
+
+}

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

@@ -0,0 +1,21 @@
+package info.nightscout.androidaps.plugins.Overview.Dialogs;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+
+public class ErrorHelperActivity extends AppCompatActivity {
+    public ErrorHelperActivity() {
+        super();
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        ErrorDialog errorDialog = new ErrorDialog();
+        errorDialog.setHelperActivity(this);
+        errorDialog.setStatus(getIntent().getStringExtra("status"));
+        errorDialog.setSound(getIntent().getIntExtra("soundid", 0));
+        errorDialog.setTitle(getIntent().getStringExtra("title"));
+        errorDialog.show(this.getSupportFragmentManager(), "Error");
+    }
+}

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

@@ -2,9 +2,8 @@ package info.nightscout.androidaps.plugins.Overview.Dialogs;
 
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.HandlerThread;
 import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AlertDialog;
 import android.text.Editable;
@@ -30,12 +29,11 @@ import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
-import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
+import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.utils.NumberPicker;
 import info.nightscout.utils.SafeParse;
 import info.nightscout.utils.ToastUtils;
@@ -49,12 +47,11 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
     private Integer maxCarbs;
     private Double maxInsulin;
 
-    private Handler mHandler;
+    //one shot guards
+    private boolean accepted;
+    private boolean okClicked;
 
     public NewTreatmentDialog() {
-        HandlerThread mHandlerThread = new HandlerThread(NewTreatmentDialog.class.getSimpleName());
-        mHandlerThread.start();
-        this.mHandler = new Handler(mHandlerThread.getLooper());
     }
 
     final private TextWatcher textWatcher = new TextWatcher() {
@@ -103,15 +100,23 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
         editInsulin = (NumberPicker) view.findViewById(R.id.treatments_newtreatment_insulinamount);
 
         editCarbs.setParams(0d, 0d, (double) maxCarbs, 1d, new DecimalFormat("0"), false, textWatcher);
-        editInsulin.setParams(0d, 0d, maxInsulin, MainApp.getConfigBuilder().getPumpDescription().bolusStep, new DecimalFormat("0.00"), false, textWatcher);
+        editInsulin.setParams(0d, 0d, maxInsulin, ConfigBuilderPlugin.getActivePump().getPumpDescription().bolusStep, new DecimalFormat("0.00"), false, textWatcher);
 
+        setCancelable(true);
+        getDialog().setCanceledOnTouchOutside(false);
         return view;
     }
 
     @Override
-    public void onClick(View view) {
+    public synchronized void onClick(View view) {
         switch (view.getId()) {
             case R.id.ok:
+                if (okClicked) {
+                    log.debug("guarding: ok already clicked");
+                    dismiss();
+                    return;
+                }
+                okClicked = true;
 
                 try {
                     Double insulin = SafeParse.stringToDouble(editInsulin.getText());
@@ -132,17 +137,19 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
                     final int finalCarbsAfterConstraints = carbsAfterConstraints;
 
                     final Context context = getContext();
-                    AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                    final AlertDialog.Builder builder = new AlertDialog.Builder(context);
 
                     builder.setTitle(this.getContext().getString(R.string.confirmation));
                     builder.setMessage(Html.fromHtml(confirmMessage));
                     builder.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int id) {
+                            synchronized (builder) {
+                                if (accepted) {
+                                    log.debug("guarding: already accepted");
+                                    return;
+                                }
+                                accepted = true;
                                 if (finalInsulinAfterConstraints > 0 || finalCarbsAfterConstraints > 0) {
-                                final PumpInterface pump = MainApp.getConfigBuilder();
-                                mHandler.post(new Runnable() {
-                                    @Override
-                                    public void run() {
                                     DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo();
                                     if (finalInsulinAfterConstraints == 0)
                                         detailedBolusInfo.eventType = CareportalEvent.CARBCORRECTION;
@@ -152,28 +159,33 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
                                     detailedBolusInfo.carbs = finalCarbsAfterConstraints;
                                     detailedBolusInfo.context = context;
                                     detailedBolusInfo.source = Source.USER;
-                                        PumpEnactResult result = pump.deliverTreatment(detailedBolusInfo);
+                                    if (detailedBolusInfo.insulin > 0 || ConfigBuilderPlugin.getActivePump().getPumpDescription().storesCarbInfo) {
+                                        ConfigBuilderPlugin.getCommandQueue().bolus(detailedBolusInfo, new Callback() {
+                                            @Override
+                                            public void run() {
                                                 if (!result.success) {
-                                            try {
+                                                    Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
-                                                AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                                                    i.putExtra("soundid", R.raw.boluserror);
-                                                builder.setTitle(MainApp.sResources.getString(R.string.treatmentdeliveryerror));
+                                                    i.putExtra("status", result.comment);
-                                                builder.setMessage(result.comment);
+                                                    i.putExtra("title", MainApp.sResources.getString(R.string.treatmentdeliveryerror));
-                                                builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), null);
+                                                    i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                                builder.show();
+                                                    MainApp.instance().startActivity(i);
-                                            } catch (WindowManager.BadTokenException | NullPointerException e) {
-                                                // window has been destroyed
-                                                Notification notification = new Notification(Notification.BOLUS_DELIVERY_ERROR, MainApp.sResources.getString(R.string.treatmentdeliveryerror), Notification.URGENT);
-                                                MainApp.bus().post(new EventNewNotification(notification));
-                                            }
                                                 }
                                             }
                                         });
+                                    } else {
+                                        MainApp.getConfigBuilder().addToHistoryTreatment(detailedBolusInfo);
+                                    }
                                     Answers.getInstance().logCustom(new CustomEvent("Bolus"));
                                 }
                             }
+                        }
                     });
-                    builder.setNegativeButton(getString(R.string.cancel), null);
+                    builder.setNegativeButton(
+
+                            getString(R.string.cancel), null);
                     builder.show();
+
                     dismiss();
                 } catch (Exception e) {
                     log.error("Unhandled exception", e);

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

@@ -3,9 +3,8 @@ package info.nightscout.androidaps.plugins.Overview.Dialogs;
 import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.HandlerThread;
 import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AlertDialog;
 import android.text.Editable;
@@ -32,7 +31,6 @@ import com.squareup.otto.Subscribe;
 
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.mozilla.javascript.tools.debugger.Main;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -47,7 +45,6 @@ import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.ProfileStore;
-import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.db.DatabaseHelper;
@@ -56,16 +53,17 @@ 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.IobCobCalculator.events.EventAutosensCalculationFinished;
 import info.nightscout.androidaps.plugins.Loop.LoopPlugin;
 import info.nightscout.androidaps.plugins.OpenAPSAMA.OpenAPSAMAPlugin;
 import info.nightscout.androidaps.plugins.OpenAPSMA.events.EventOpenAPSUpdateGui;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.utils.BolusWizard;
 import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.DecimalFormatter;
 import info.nightscout.utils.NumberPicker;
-import info.nightscout.utils.OKDialog;
 import info.nightscout.utils.SP;
 import info.nightscout.utils.SafeParse;
 import info.nightscout.utils.ToastUtils;
@@ -107,18 +105,15 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
     Integer calculatedCarbs = 0;
     Double calculatedTotalInsulin = 0d;
     JSONObject boluscalcJSON;
-    boolean cobAvailable = false;
-
-    Handler mHandler;
-    public static HandlerThread mHandlerThread;
 
     Context context;
 
+    //one shot guards
+    private boolean accepted;
+    private boolean okClicked;
+
     public WizardDialog() {
         super();
-        mHandlerThread = new HandlerThread(WizardDialog.class.getSimpleName());
-        mHandlerThread.start();
-        mHandler = new Handler(mHandlerThread.getLooper());
     }
 
     @Override
@@ -146,26 +141,19 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
     }
 
     @Subscribe
-    public void onStatusEvent(final EventOpenAPSUpdateGui e) {
+    public void onStatusEvent(final EventNewBG 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) {
+    public void onStatusEvent(final EventAutosensCalculationFinished e) {
         Activity activity = getActivity();
         if (activity != null)
             activity.runOnUiThread(new Runnable() {
@@ -253,11 +241,13 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
 
         editBg.setParams(0d, 0d, 500d, 0.1d, new DecimalFormat("0.0"), false, textWatcher);
         editCarbs.setParams(0d, 0d, (double) maxCarbs, 1d, new DecimalFormat("0"), false, textWatcher);
-        double bolusstep = MainApp.getConfigBuilder().getPumpDescription().bolusStep;
+        double bolusstep = ConfigBuilderPlugin.getActivePump().getPumpDescription().bolusStep;
         editCorr.setParams(0d, -maxCorrection, maxCorrection, bolusstep, new DecimalFormat("0.00"), false, textWatcher);
         editCarbTime.setParams(0d, -60d, 60d, 5d, new DecimalFormat("0"), false);
         initDialog();
 
+        setCancelable(true);
+        getDialog().setCanceledOnTouchOutside(false);
         return view;
     }
 
@@ -297,9 +287,15 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
     }
 
     @Override
-    public void onClick(View view) {
+    public synchronized void onClick(View view) {
         switch (view.getId()) {
             case R.id.ok:
+                if (okClicked) {
+                    log.debug("guarding: ok already clicked");
+                    dismiss();
+                    return;
+                }
+                okClicked = true;
                 if (calculatedTotalInsulin > 0d || calculatedCarbs > 0d) {
                     DecimalFormat formatNumber2decimalplaces = new DecimalFormat("0.00");
 
@@ -327,29 +323,38 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
                     final int carbTime = SafeParse.stringToInt(editCarbTime.getText());
                     final boolean useSuperBolus = superbolusCheckbox.isChecked();
 
-                    AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                    final AlertDialog.Builder builder = new AlertDialog.Builder(context);
                     builder.setTitle(MainApp.sResources.getString(R.string.confirmation));
                     builder.setMessage(Html.fromHtml(confirmMessage));
                     builder.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int id) {
+                            synchronized (builder) {
+                                if (accepted) {
+                                    log.debug("guarding: already accepted");
+                                    return;
+                                }
+                                accepted = true;
                                 if (finalInsulinAfterConstraints > 0 || finalCarbsAfterConstraints > 0) {
-                                final ConfigBuilderPlugin pump = MainApp.getConfigBuilder();
-                                mHandler.post(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        PumpEnactResult result;
                                     if (useSuperBolus) {
-                                            final LoopPlugin activeloop = MainApp.getConfigBuilder().getActiveLoop();
+                                        final LoopPlugin activeloop = ConfigBuilderPlugin.getActiveLoop();
                                         if (activeloop != null) {
                                             activeloop.superBolusTo(System.currentTimeMillis() + 2 * 60L * 60 * 1000);
                                             MainApp.bus().post(new EventRefreshOverview("WizardDialog"));
                                         }
-                                            pump.cancelTempBasal(true);
+                                        ConfigBuilderPlugin.getCommandQueue().tempBasalPercent(0, 120, true, new Callback() {
-                                            result = pump.setTempBasalAbsolute(0d, 120, true);
+                                            @Override
+                                            public void run() {
                                                 if (!result.success) {
-                                                OKDialog.show(getActivity(), MainApp.sResources.getString(R.string.tempbasaldeliveryerror), result.comment, null);
+                                                    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;
@@ -360,25 +365,27 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
                                     detailedBolusInfo.carbTime = carbTime;
                                     detailedBolusInfo.boluscalc = boluscalcJSON;
                                     detailedBolusInfo.source = Source.USER;
-                                        result = pump.deliverTreatment(detailedBolusInfo);
+                                    if (detailedBolusInfo.insulin > 0 || ConfigBuilderPlugin.getActivePump().getPumpDescription().storesCarbInfo) {
+                                        ConfigBuilderPlugin.getCommandQueue().bolus(detailedBolusInfo, new Callback() {
+                                            @Override
+                                            public void run() {
                                                 if (!result.success) {
-                                            try {
+                                                    Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
-                                                AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                                                    i.putExtra("soundid", R.raw.boluserror);
-                                                builder.setTitle(MainApp.sResources.getString(R.string.treatmentdeliveryerror));
+                                                    i.putExtra("status", result.comment);
-                                                builder.setMessage(result.comment);
+                                                    i.putExtra("title", MainApp.sResources.getString(R.string.treatmentdeliveryerror));
-                                                builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), null);
+                                                    i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                                builder.show();
+                                                    MainApp.instance().startActivity(i);
-                                            } catch (WindowManager.BadTokenException | NullPointerException e) {
-                                                // window has been destroyed
-                                                Notification notification = new Notification(Notification.BOLUS_DELIVERY_ERROR, MainApp.sResources.getString(R.string.treatmentdeliveryerror), Notification.URGENT);
-                                                MainApp.bus().post(new EventNewNotification(notification));
-                                            }
                                                 }
                                             }
                                         });
+                                    } else {
+                                        MainApp.getConfigBuilder().addToHistoryTreatment(detailedBolusInfo);
+                                    }
                                     Answers.getInstance().logCustom(new CustomEvent("Wizard"));
                                 }
                             }
+                        }
                     });
                     builder.setNegativeButton(getString(R.string.cancel), null);
                     builder.show();
@@ -393,7 +400,7 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
 
     private void initDialog() {
         Profile profile = MainApp.getConfigBuilder().getProfile();
-        ProfileStore profileStore = MainApp.getConfigBuilder().getActiveProfileInterface().getProfile();
+        ProfileStore profileStore = ConfigBuilderPlugin.getActiveProfileInterface().getProfile();
 
         if (profile == null) {
             ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.sResources.getString(R.string.noprofile));
@@ -403,7 +410,7 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
         ArrayList<CharSequence> profileList;
         profileList = profileStore.getProfileList();
         profileList.add(0, MainApp.sResources.getString(R.string.active));
-        ArrayAdapter<CharSequence> adapter = new ArrayAdapter<CharSequence>(getContext(),
+        ArrayAdapter<CharSequence> adapter = new ArrayAdapter<>(getContext(),
                 R.layout.spinner_centered, profileList);
 
         profileSpinner.setAdapter(adapter);
@@ -432,19 +439,11 @@ 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();
     }
 
     private void calculateInsulin() {
-        ProfileStore profile = MainApp.getConfigBuilder().getActiveProfileInterface().getProfile();
+        ProfileStore profile = ConfigBuilderPlugin.getActiveProfileInterface().getProfile();
         if (profileSpinner == null || profileSpinner.getSelectedItem() == null)
             return; // not initialized yet
         String selectedAlternativeProfile = profileSpinner.getSelectedItem().toString();
@@ -476,13 +475,11 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
 
         // COB
         Double c_cob = 0d;
-        if (cobAvailable && cobCheckbox.isChecked()) {
+        if (cobCheckbox.isChecked()) {
-            if (ConfigBuilderPlugin.getActiveAPS().getLastAPSResult() != null && ConfigBuilderPlugin.getActiveAPS().getLastAPSRun().after(new Date(System.currentTimeMillis() - 11 * 60 * 1000L))) {
+            AutosensData autosensData = IobCobCalculatorPlugin.getLastAutosensData("Wizard COB");
-                try {
+
-                    c_cob = SafeParse.stringToDouble(ConfigBuilderPlugin.getActiveAPS().getLastAPSResult().json().getString("COB"));
+            if(autosensData != null) {
-                } catch (JSONException e) {
+                c_cob = autosensData.cob;
-                    log.error("Unhandled exception", e);
-                }
             }
         }
 
@@ -524,7 +521,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 {
@@ -535,12 +532,12 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
         if (calculatedTotalInsulin > 0d || calculatedCarbs > 0d) {
             String insulinText = calculatedTotalInsulin > 0d ? (DecimalFormatter.to2Decimal(calculatedTotalInsulin) + "U") : "";
             String carbsText = calculatedCarbs > 0d ? (DecimalFormatter.to0Decimal(calculatedCarbs) + "g") : "";
-            total.setText(getString(R.string.result) + ": " + insulinText + " " + carbsText);
+            total.setText(MainApp.gs(R.string.result) + ": " + insulinText + " " + carbsText);
             okButton.setVisibility(View.VISIBLE);
         } else {
             // TODO this should also be run when loading the dialog as the OK button is initially visible
             //      but does nothing if neither carbs nor insulin is > 0
-            total.setText(getString(R.string.missing) + " " + DecimalFormatter.to0Decimal(wizard.carbsEquivalent) + "g");
+            total.setText(MainApp.gs(R.string.missing) + " " + DecimalFormatter.to0Decimal(wizard.carbsEquivalent) + "g");
             okButton.setVisibility(View.INVISIBLE);
         }
 

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

@@ -5,13 +5,13 @@ import android.app.Activity;
 import android.app.NotificationManager;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.graphics.Color;
-import android.graphics.DashPathEffect;
 import android.graphics.Paint;
 import android.os.Bundle;
 import android.os.Handler;
-import android.os.HandlerThread;
 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;
@@ -26,7 +26,6 @@ import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
@@ -37,11 +36,6 @@ import com.crashlytics.android.Crashlytics;
 import com.crashlytics.android.answers.Answers;
 import com.crashlytics.android.answers.CustomEvent;
 import com.jjoe64.graphview.GraphView;
-import com.jjoe64.graphview.ValueDependentColor;
-import com.jjoe64.graphview.series.BarGraphSeries;
-import com.jjoe64.graphview.series.DataPoint;
-import com.jjoe64.graphview.series.LineGraphSeries;
-import com.jjoe64.graphview.series.Series;
 import com.squareup.otto.Subscribe;
 
 import org.json.JSONException;
@@ -50,7 +44,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.text.DecimalFormat;
-import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -60,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;
@@ -69,7 +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.PumpEnactResult;
+import info.nightscout.androidaps.data.QuickWizardEntry;
 import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.db.DatabaseHelper;
@@ -87,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;
@@ -103,16 +96,18 @@ import info.nightscout.androidaps.plugins.NSClientInternal.data.NSDeviceStatus;
 import info.nightscout.androidaps.plugins.OpenAPSAMA.DetermineBasalResultAMA;
 import info.nightscout.androidaps.plugins.OpenAPSAMA.OpenAPSAMAPlugin;
 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.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventSetWakeLock;
 import info.nightscout.androidaps.plugins.Overview.graphData.GraphData;
-import info.nightscout.androidaps.plugins.Overview.graphExtensions.FixedLineGraphSeries;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.Overview.graphExtensions.TimeAsXAxisLabelFormatter;
+import info.nightscout.androidaps.plugins.Overview.notifications.NotificationStore;
 import info.nightscout.androidaps.plugins.SourceXdrip.SourceXdripPlugin;
 import info.nightscout.androidaps.plugins.Treatments.fragments.ProfileViewerDialog;
+import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.utils.BolusWizard;
 import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.DecimalFormatter;
@@ -120,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;
@@ -152,22 +148,28 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
     TextView sage;
     TextView pbage;
 
-    CheckBox showPredictionView;
+    TextView showPredictionLabel;
-    CheckBox showBasalsView;
+    CheckBox showPredictionCheckbox;
-    CheckBox showIobView;
+    TextView showBasalsLabel;
-    CheckBox showCobView;
+    CheckBox showBasalsCheckbox;
-    CheckBox showDeviationsView;
+    TextView showIobLabel;
-    CheckBox showRatiosView;
+    CheckBox showIobCheckbox;
+    TextView showCobLabel;
+    CheckBox showCobCheckbox;
+    TextView showDeviationsLabel;
+    CheckBox showDeviationsCheckbox;
+    TextView showRatiosLabel;
+    CheckBox showRatiosCheckbox;
 
     RecyclerView notificationsView;
     LinearLayoutManager llm;
 
     LinearLayout acceptTempLayout;
-    Button treatmentButton;
+    SingleClickButton treatmentButton;
-    Button wizardButton;
+    SingleClickButton wizardButton;
-    Button calibrationButton;
+    SingleClickButton calibrationButton;
-    Button acceptTempButton;
+    SingleClickButton acceptTempButton;
-    Button quickWizardButton;
+    SingleClickButton quickWizardButton;
 
     CheckBox lockScreen;
 
@@ -176,24 +178,20 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
 
     public static boolean shorttextmode = false;
 
+    private boolean accepted;
+
     private int rangeToDisplay = 6; // for graph
 
     Handler sLoopHandler = new Handler();
     Runnable sRefreshLoop = null;
 
-    private static Handler sHandler;
+    final Object updateSync = new Object();
-    private static HandlerThread sHandlerThread;
 
     private static final ScheduledExecutorService worker = Executors.newSingleThreadScheduledExecutor();
     private static ScheduledFuture<?> scheduledUpdate = null;
 
     public OverviewFragment() {
         super();
-        if (sHandlerThread == null) {
-            sHandlerThread = new HandlerThread(OverviewFragment.class.getSimpleName());
-            sHandlerThread.start();
-            sHandler = new Handler(sHandlerThread.getLooper());
-        }
     }
 
     @Override
@@ -206,15 +204,15 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             getActivity().getWindowManager().getDefaultDisplay().getMetrics(dm);
             int screen_width = dm.widthPixels;
             int screen_height = dm.heightPixels;
-            smallWidth = screen_width < Constants.SMALL_WIDTH;
+            smallWidth = screen_width <= Constants.SMALL_WIDTH;
-            smallHeight = screen_height < Constants.SMALL_HEIGHT;
+            smallHeight = screen_height <= Constants.SMALL_HEIGHT;
             boolean landscape = screen_height < screen_width;
 
             View view;
 
-            if (MainApp.sResources.getBoolean(R.bool.isTablet) && BuildConfig.NSCLIENTOLNY) {
+            if (MainApp.sResources.getBoolean(R.bool.isTablet) && (Config.NSCLIENT || Config.G5UPLOADER)) {
                 view = inflater.inflate(R.layout.overview_fragment_nsclient_tablet, container, false);
-            } else if (BuildConfig.NSCLIENTOLNY) {
+            } else if (Config.NSCLIENT || Config.G5UPLOADER) {
                 view = inflater.inflate(R.layout.overview_fragment_nsclient, container, false);
                 shorttextmode = true;
             } else if (smallHeight || landscape) {
@@ -257,39 +255,53 @@ 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);
 
             acceptTempLayout = (LinearLayout) view.findViewById(R.id.overview_accepttemplayout);
 
-            showPredictionView = (CheckBox) view.findViewById(R.id.overview_showprediction);
+            showPredictionCheckbox = (CheckBox) view.findViewById(R.id.overview_showprediction);
-            showBasalsView = (CheckBox) view.findViewById(R.id.overview_showbasals);
+            showBasalsCheckbox = (CheckBox) view.findViewById(R.id.overview_showbasals);
-            showIobView = (CheckBox) view.findViewById(R.id.overview_showiob);
+            showIobCheckbox = (CheckBox) view.findViewById(R.id.overview_showiob);
-            showCobView = (CheckBox) view.findViewById(R.id.overview_showcob);
+            showCobCheckbox = (CheckBox) view.findViewById(R.id.overview_showcob);
-            showDeviationsView = (CheckBox) view.findViewById(R.id.overview_showdeviations);
+            showDeviationsCheckbox = (CheckBox) view.findViewById(R.id.overview_showdeviations);
-            showRatiosView = (CheckBox) view.findViewById(R.id.overview_showratios);
+            showRatiosCheckbox = (CheckBox) view.findViewById(R.id.overview_showratios);
-            showPredictionView.setChecked(SP.getBoolean("showprediction", false));
+            showPredictionCheckbox.setChecked(SP.getBoolean("showprediction", false));
-            showBasalsView.setChecked(SP.getBoolean("showbasals", true));
+            showBasalsCheckbox.setChecked(SP.getBoolean("showbasals", true));
-            showIobView.setChecked(SP.getBoolean("showiob", false));
+            showIobCheckbox.setChecked(SP.getBoolean("showiob", false));
-            showCobView.setChecked(SP.getBoolean("showcob", false));
+            showCobCheckbox.setChecked(SP.getBoolean("showcob", false));
-            showDeviationsView.setChecked(SP.getBoolean("showdeviations", false));
+            showDeviationsCheckbox.setChecked(SP.getBoolean("showdeviations", false));
-            showRatiosView.setChecked(SP.getBoolean("showratios", false));
+            showRatiosCheckbox.setChecked(SP.getBoolean("showratios", false));
-            showPredictionView.setOnCheckedChangeListener(this);
+            showPredictionCheckbox.setOnCheckedChangeListener(this);
-            showBasalsView.setOnCheckedChangeListener(this);
+            showBasalsCheckbox.setOnCheckedChangeListener(this);
-            showIobView.setOnCheckedChangeListener(this);
+            showIobCheckbox.setOnCheckedChangeListener(this);
-            showCobView.setOnCheckedChangeListener(this);
+            showCobCheckbox.setOnCheckedChangeListener(this);
-            showDeviationsView.setOnCheckedChangeListener(this);
+            showDeviationsCheckbox.setOnCheckedChangeListener(this);
-            showRatiosView.setOnCheckedChangeListener(this);
+            showRatiosCheckbox.setOnCheckedChangeListener(this);
+
+            showPredictionLabel = (TextView) view.findViewById(R.id.overview_showprediction_label);
+            showPredictionLabel.setOnClickListener(this);
+            showBasalsLabel = (TextView) view.findViewById(R.id.overview_showbasals_label);
+            showBasalsLabel.setOnClickListener(this);
+            showIobLabel = (TextView) view.findViewById(R.id.overview_showiob_label);
+            showIobLabel.setOnClickListener(this);
+            showCobLabel = (TextView) view.findViewById(R.id.overview_showcob_label);
+            showCobLabel.setOnClickListener(this);
+            showDeviationsLabel = (TextView) view.findViewById(R.id.overview_showdeviations_label);
+            showDeviationsLabel.setOnClickListener(this);
+            showRatiosLabel = (TextView) view.findViewById(R.id.overview_showratios_label);
+            showRatiosLabel.setOnClickListener(this);
 
             notificationsView = (RecyclerView) view.findViewById(R.id.overview_notifications);
             notificationsView.setHasFixedSize(true);
@@ -333,6 +345,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             return view;
         } catch (Exception e) {
             Crashlytics.logException(e);
+            log.debug("Runtime Exception", e);
         }
 
         return null;
@@ -344,6 +357,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));
@@ -354,6 +368,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));
@@ -379,24 +394,24 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             case R.id.overview_showiob:
                 break;
             case R.id.overview_showcob:
-                showDeviationsView.setOnCheckedChangeListener(null);
+                showDeviationsCheckbox.setOnCheckedChangeListener(null);
-                showDeviationsView.setChecked(false);
+                showDeviationsCheckbox.setChecked(false);
-                showDeviationsView.setOnCheckedChangeListener(this);
+                showDeviationsCheckbox.setOnCheckedChangeListener(this);
                 break;
             case R.id.overview_showdeviations:
-                showCobView.setOnCheckedChangeListener(null);
+                showCobCheckbox.setOnCheckedChangeListener(null);
-                showCobView.setChecked(false);
+                showCobCheckbox.setChecked(false);
-                showCobView.setOnCheckedChangeListener(this);
+                showCobCheckbox.setOnCheckedChangeListener(this);
                 break;
             case R.id.overview_showratios:
                 break;
         }
-        SP.putBoolean("showiob", showIobView.isChecked());
+        SP.putBoolean("showiob", showIobCheckbox.isChecked());
-        SP.putBoolean("showprediction", showPredictionView.isChecked());
+        SP.putBoolean("showprediction", showPredictionCheckbox.isChecked());
-        SP.putBoolean("showbasals", showBasalsView.isChecked());
+        SP.putBoolean("showbasals", showBasalsCheckbox.isChecked());
-        SP.putBoolean("showcob", showCobView.isChecked());
+        SP.putBoolean("showcob", showCobCheckbox.isChecked());
-        SP.putBoolean("showdeviations", showDeviationsView.isChecked());
+        SP.putBoolean("showdeviations", showDeviationsCheckbox.isChecked());
-        SP.putBoolean("showratios", showRatiosView.isChecked());
+        SP.putBoolean("showratios", showRatiosCheckbox.isChecked());
         scheduleUpdateGUI("onGraphCheckboxesCheckedChanged");
     }
 
@@ -408,10 +423,9 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             activeloop.setFragmentVisible(PluginBase.LOOP, false);
             MainApp.getConfigBuilder().storeSettings();
             updateGUI("suspendmenu");
-            sHandler.post(new Runnable() {
+            ConfigBuilderPlugin.getCommandQueue().cancelTempBasal(true, new Callback() {
                 @Override
                 public void run() {
-                    PumpEnactResult result = MainApp.getConfigBuilder().cancelTempBasal(true);
                     if (!result.success) {
                         ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.sResources.getString(R.string.tempbasaldeliveryerror));
                     }
@@ -429,10 +443,9 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         } else if (item.getTitle().equals(MainApp.sResources.getString(R.string.resume))) {
             activeloop.suspendTo(0L);
             updateGUI("suspendmenu");
-            sHandler.post(new Runnable() {
+            ConfigBuilderPlugin.getCommandQueue().cancelTempBasal(true, new Callback() {
                 @Override
                 public void run() {
-                    PumpEnactResult result = MainApp.getConfigBuilder().cancelTempBasal(true);
                     if (!result.success) {
                         ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.sResources.getString(R.string.tempbasaldeliveryerror));
                     }
@@ -443,10 +456,9 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         } else if (item.getTitle().equals(MainApp.sResources.getString(R.string.suspendloopfor1h))) {
             activeloop.suspendTo(System.currentTimeMillis() + 60L * 60 * 1000);
             updateGUI("suspendmenu");
-            sHandler.post(new Runnable() {
+            ConfigBuilderPlugin.getCommandQueue().cancelTempBasal(true, new Callback() {
                 @Override
                 public void run() {
-                    PumpEnactResult result = MainApp.getConfigBuilder().cancelTempBasal(true);
                     if (!result.success) {
                         ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.sResources.getString(R.string.tempbasaldeliveryerror));
                     }
@@ -457,10 +469,9 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         } else if (item.getTitle().equals(MainApp.sResources.getString(R.string.suspendloopfor2h))) {
             activeloop.suspendTo(System.currentTimeMillis() + 2 * 60L * 60 * 1000);
             updateGUI("suspendmenu");
-            sHandler.post(new Runnable() {
+            ConfigBuilderPlugin.getCommandQueue().cancelTempBasal(true, new Callback() {
                 @Override
                 public void run() {
-                    PumpEnactResult result = MainApp.getConfigBuilder().cancelTempBasal(true);
                     if (!result.success) {
                         ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.sResources.getString(R.string.tempbasaldeliveryerror));
                     }
@@ -471,10 +482,9 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         } else if (item.getTitle().equals(MainApp.sResources.getString(R.string.suspendloopfor3h))) {
             activeloop.suspendTo(System.currentTimeMillis() + 3 * 60L * 60 * 1000);
             updateGUI("suspendmenu");
-            sHandler.post(new Runnable() {
+            ConfigBuilderPlugin.getCommandQueue().cancelTempBasal(true, new Callback() {
                 @Override
                 public void run() {
-                    PumpEnactResult result = MainApp.getConfigBuilder().cancelTempBasal(true);
                     if (!result.success) {
                         ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.sResources.getString(R.string.tempbasaldeliveryerror));
                     }
@@ -485,10 +495,9 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         } else if (item.getTitle().equals(MainApp.sResources.getString(R.string.suspendloopfor10h))) {
             activeloop.suspendTo(System.currentTimeMillis() + 10 * 60L * 60 * 1000);
             updateGUI("suspendmenu");
-            sHandler.post(new Runnable() {
+            ConfigBuilderPlugin.getCommandQueue().cancelTempBasal(true, new Callback() {
                 @Override
                 public void run() {
-                    PumpEnactResult result = MainApp.getConfigBuilder().cancelTempBasal(true);
                     if (!result.success) {
                         ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.sResources.getString(R.string.tempbasaldeliveryerror));
                     }
@@ -497,59 +506,95 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             NSUpload.uploadOpenAPSOffline(600);
             return true;
         } else if (item.getTitle().equals(MainApp.sResources.getString(R.string.disconnectpumpfor30m))) {
-            activeloop.suspendTo(System.currentTimeMillis() + 30L * 60 * 1000);
+            activeloop.disconnectTo(System.currentTimeMillis() + 30L * 60 * 1000);
             updateGUI("suspendmenu");
-            sHandler.post(new Runnable() {
+            ConfigBuilderPlugin.getCommandQueue().tempBasalPercent(0, 30, true, new Callback() {
                 @Override
                 public void run() {
-                    PumpEnactResult result = MainApp.getConfigBuilder().setTempBasalAbsolute(0d, 30, true);
                     if (!result.success) {
                         ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.sResources.getString(R.string.tempbasaldeliveryerror));
                     }
                 }
             });
+            if (MainApp.getConfigBuilder().getActivePump().getPumpDescription().isExtendedBolusCapable && MainApp.getConfigBuilder().isInHistoryExtendedBoluslInProgress()) {
+                ConfigBuilderPlugin.getCommandQueue().cancelExtended( new Callback() {
+                    @Override
+                    public void run() {
+                        if (!result.success) {
+                            ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.sResources.getString(R.string.extendedbolusdeliveryerror));
+                        }
+                    }
+                });
+            }
             NSUpload.uploadOpenAPSOffline(30);
             return true;
         } else if (item.getTitle().equals(MainApp.sResources.getString(R.string.disconnectpumpfor1h))) {
-            activeloop.suspendTo(System.currentTimeMillis() + 1 * 60L * 60 * 1000);
+            activeloop.disconnectTo(System.currentTimeMillis() + 1 * 60L * 60 * 1000);
             updateGUI("suspendmenu");
-            sHandler.post(new Runnable() {
+            ConfigBuilderPlugin.getCommandQueue().tempBasalPercent(0, 60, true, new Callback() {
                 @Override
                 public void run() {
-                    PumpEnactResult result = MainApp.getConfigBuilder().setTempBasalAbsolute(0d, 60, true);
                     if (!result.success) {
                         ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.sResources.getString(R.string.tempbasaldeliveryerror));
                     }
                 }
             });
+            if (MainApp.getConfigBuilder().getActivePump().getPumpDescription().isExtendedBolusCapable && MainApp.getConfigBuilder().isInHistoryExtendedBoluslInProgress()) {
+                ConfigBuilderPlugin.getCommandQueue().cancelExtended( new Callback() {
+                    @Override
+                    public void run() {
+                        if (!result.success) {
+                            ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.sResources.getString(R.string.extendedbolusdeliveryerror));
+                        }
+                    }
+                });
+            }
             NSUpload.uploadOpenAPSOffline(60);
             return true;
         } else if (item.getTitle().equals(MainApp.sResources.getString(R.string.disconnectpumpfor2h))) {
-            activeloop.suspendTo(System.currentTimeMillis() + 2 * 60L * 60 * 1000);
+            activeloop.disconnectTo(System.currentTimeMillis() + 2 * 60L * 60 * 1000);
             updateGUI("suspendmenu");
-            sHandler.post(new Runnable() {
+            ConfigBuilderPlugin.getCommandQueue().tempBasalPercent(0, 2 * 60, true, new Callback() {
                 @Override
                 public void run() {
-                    PumpEnactResult result = MainApp.getConfigBuilder().setTempBasalAbsolute(0d, 2 * 60, true);
                     if (!result.success) {
                         ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.sResources.getString(R.string.tempbasaldeliveryerror));
                     }
                 }
             });
+            if (MainApp.getConfigBuilder().getActivePump().getPumpDescription().isExtendedBolusCapable && MainApp.getConfigBuilder().isInHistoryExtendedBoluslInProgress()) {
+                ConfigBuilderPlugin.getCommandQueue().cancelExtended( new Callback() {
+                    @Override
+                    public void run() {
+                        if (!result.success) {
+                            ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.sResources.getString(R.string.extendedbolusdeliveryerror));
+                        }
+                    }
+                });
+            }
             NSUpload.uploadOpenAPSOffline(120);
             return true;
         } else if (item.getTitle().equals(MainApp.sResources.getString(R.string.disconnectpumpfor3h))) {
-            activeloop.suspendTo(System.currentTimeMillis() + 3 * 60L * 60 * 1000);
+            activeloop.disconnectTo(System.currentTimeMillis() + 3 * 60L * 60 * 1000);
             updateGUI("suspendmenu");
-            sHandler.post(new Runnable() {
+            ConfigBuilderPlugin.getCommandQueue().tempBasalPercent(0, 3 * 60, true, new Callback() {
                 @Override
                 public void run() {
-                    PumpEnactResult result = MainApp.getConfigBuilder().setTempBasalAbsolute(0d, 3 * 60, true);
                     if (!result.success) {
                         ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.sResources.getString(R.string.tempbasaldeliveryerror));
                     }
                 }
             });
+            if (MainApp.getConfigBuilder().getActivePump().getPumpDescription().isExtendedBolusCapable && MainApp.getConfigBuilder().isInHistoryExtendedBoluslInProgress()) {
+                ConfigBuilderPlugin.getCommandQueue().cancelExtended( new Callback() {
+                    @Override
+                    public void run() {
+                        if (!result.success) {
+                            ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.sResources.getString(R.string.extendedbolusdeliveryerror));
+                        }
+                    }
+                });
+            }
             NSUpload.uploadOpenAPSOffline(180);
             return true;
         } else if (item.getTitle().equals(MainApp.sResources.getString(R.string.careportal_profileswitch))) {
@@ -590,18 +635,42 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 treatmentDialogFragment.show(manager, "TreatmentDialog");
                 break;
             case R.id.overview_pumpstatus:
-                if (MainApp.getConfigBuilder().isSuspended() || !MainApp.getConfigBuilder().isInitialized())
+                if (ConfigBuilderPlugin.getActivePump().isSuspended() || !ConfigBuilderPlugin.getActivePump().isInitialized())
-                    sHandler.post(new Runnable() {
+                    ConfigBuilderPlugin.getCommandQueue().readStatus("RefreshClicked", null);
-                        @Override
+                break;
-                        public void run() {
+            case R.id.overview_showprediction_label:
-                            MainApp.getConfigBuilder().refreshDataFromPump("RefreshClicked");
+                showPredictionCheckbox.toggle();
-                        }
+                break;
-                    });
+            case R.id.overview_showbasals_label:
+                showBasalsCheckbox.toggle();
+                break;
+            case R.id.overview_showiob_label:
+                showIobCheckbox.toggle();
+                break;
+            case R.id.overview_showcob_label:
+                showCobCheckbox.toggle();
+                break;
+            case R.id.overview_showdeviations_label:
+                showDeviationsCheckbox.toggle();
+                break;
+            case R.id.overview_showratios_label:
+                showRatiosCheckbox.toggle();
                 break;
         }
 
     }
 
+    @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);
@@ -612,14 +681,13 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 builder.setMessage(getContext().getString(R.string.setbasalquestion) + "\n" + finalLastRun.constraintsProcessed);
                 builder.setPositiveButton(getContext().getString(R.string.ok), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
-                        sHandler.post(new Runnable() {
-                            @Override
-                            public void run() {
                         hideTempRecommendation();
                         clearNotification();
-                                PumpEnactResult applyResult = MainApp.getConfigBuilder().applyAPSRequest(finalLastRun.constraintsProcessed);
+                        MainApp.getConfigBuilder().applyAPSRequest(finalLastRun.constraintsProcessed, new Callback() {
-                                if (applyResult.enacted) {
+                            @Override
-                                    finalLastRun.setByPump = applyResult;
+                            public void run() {
+                                if (result.enacted) {
+                                    finalLastRun.setByPump = result;
                                     finalLastRun.lastEnact = new Date();
                                     finalLastRun.lastOpenModeAccept = new Date();
                                     NSUpload.uploadDeviceStatus();
@@ -646,11 +714,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();
+            final BolusWizard wizard = quickWizardEntry.doCalc(profile, tempTarget, actualBg, true);
-            wizard.doCalc(profile, tempTarget, quickWizardEntry.carbs(), 0d, actualBg.valueToUnits(profile.getUnits()), 0d, true, true, false, false);
 
             final JSONObject boluscalcJSON = new JSONObject();
             try {
@@ -696,16 +763,39 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 final Double finalInsulinAfterConstraints = insulinAfterConstraints;
                 final Integer finalCarbsAfterConstraints = carbsAfterConstraints;
                 final Context context = getContext();
-                AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                final AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                accepted = false;
                 builder.setTitle(MainApp.sResources.getString(R.string.confirmation));
                 builder.setMessage(confirmMessage);
                 builder.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
+                        synchronized (builder) {
+                            if (accepted) {
+                                log.debug("guarding: already accepted");
+                                return;
+                            }
+                            accepted = true;
                             if (finalInsulinAfterConstraints > 0 || finalCarbsAfterConstraints > 0) {
-                            final ConfigBuilderPlugin pump = MainApp.getConfigBuilder();
+                                if (wizard.superBolus) {
-                            sHandler.post(new Runnable() {
+                                    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;
@@ -713,25 +803,23 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                                 detailedBolusInfo.context = context;
                                 detailedBolusInfo.boluscalc = boluscalcJSON;
                                 detailedBolusInfo.source = Source.USER;
-                                    PumpEnactResult result = pump.deliverTreatment(detailedBolusInfo);
+                                ConfigBuilderPlugin.getCommandQueue().bolus(detailedBolusInfo, new Callback() {
+                                    @Override
+                                    public void run() {
                                         if (!result.success) {
-                                        try {
+                                            Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
-                                            AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+                                            i.putExtra("soundid", R.raw.boluserror);
-                                            builder.setTitle(MainApp.sResources.getString(R.string.treatmentdeliveryerror));
+                                            i.putExtra("status", result.comment);
-                                            builder.setMessage(result.comment);
+                                            i.putExtra("title", MainApp.sResources.getString(R.string.treatmentdeliveryerror));
-                                            builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), null);
+                                            i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                            builder.show();
+                                            MainApp.instance().startActivity(i);
-                                        } catch (WindowManager.BadTokenException | NullPointerException e) {
-                                            // window has been destroyed
-                                            Notification notification = new Notification(Notification.BOLUS_DELIVERY_ERROR, MainApp.sResources.getString(R.string.treatmentdeliveryerror), Notification.URGENT);
-                                            MainApp.bus().post(new EventNewNotification(notification));
-                                        }
                                         }
                                     }
                                 });
                                 Answers.getInstance().logCustom(new CustomEvent("QuickWizard"));
                             }
                         }
+                    }
                 });
                 builder.setNegativeButton(getString(R.string.cancel), null);
                 builder.show();
@@ -893,9 +981,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;
@@ -917,7 +1005,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         BgReading actualBG = DatabaseHelper.actualBg();
         BgReading lastBG = DatabaseHelper.lastBg();
 
-        PumpInterface pump = MainApp.getConfigBuilder();
+        final PumpInterface pump = ConfigBuilderPlugin.getActivePump();
 
         Profile profile = MainApp.getConfigBuilder().getProfile();
         String units = profile.getUnits();
@@ -929,8 +1017,16 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             return;
         }
 
-        double lowLine = SP.getDouble("low_mark", 0d);
+        double lowLineSetting = SP.getDouble("low_mark", Profile.fromMgdlToUnits(OverviewPlugin.bgTargetLow, units));
-        double highLine = SP.getDouble("high_mark", 0d);
+        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 ****
@@ -959,7 +1055,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
 
         // open loop mode
         final LoopPlugin.LastRun finalLastRun = LoopPlugin.lastRun;
-        if (Config.APS && MainApp.getConfigBuilder().getPumpDescription().isTempBasalCapable) {
+        if (Config.APS && pump.getPumpDescription().isTempBasalCapable) {
             apsModeView.setVisibility(View.VISIBLE);
             apsModeView.setBackgroundColor(MainApp.sResources.getColor(R.color.loopenabled));
             apsModeView.setTextColor(Color.BLACK);
@@ -1004,9 +1100,6 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             tempTargetView.setText(Profile.toTargetRangeString(profile.getTargetLow(), profile.getTargetHigh(), units, units));
             tempTargetView.setVisibility(View.VISIBLE);
         }
-        if (Config.NSCLIENT && tempTarget == null) {
-            tempTargetView.setVisibility(View.GONE);
-        }
 
         // **** Temp button ****
         if (acceptTempLayout != null) {
@@ -1043,9 +1136,9 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             baseBasalView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    String fullText = MainApp.sResources.getString(R.string.virtualpump_basebasalrate_label) + ": " + DecimalFormatter.to2Decimal(MainApp.getConfigBuilder().getProfile().getBasal()) + "U/h\n";
+                    String fullText = MainApp.sResources.getString(R.string.pump_basebasalrate_label) + ": " + DecimalFormatter.to2Decimal(MainApp.getConfigBuilder().getProfile().getBasal()) + "U/h\n";
                     if (activeTemp != null) {
-                        fullText += MainApp.sResources.getString(R.string.virtualpump_tempbasal_label) + ": " + activeTemp.toStringFull();
+                        fullText += MainApp.sResources.getString(R.string.pump_tempbasal_label) + ": " + activeTemp.toStringFull();
                     }
                     OKDialog.show(getActivity(), MainApp.sResources.getString(R.string.basal), fullText, null);
                 }
@@ -1055,7 +1148,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             if (activeTemp != null) {
                 basalText = activeTemp.toStringFull() + " ";
             }
-            if (Config.NSCLIENT)
+            if (Config.NSCLIENT || Config.G5UPLOADER)
                 basalText += "(" + DecimalFormatter.to2Decimal(MainApp.getConfigBuilder().getProfile().getBasal()) + " U/h)";
             else if (pump.getPumpDescription().isTempBasalCapable) {
                 basalText += "(" + DecimalFormatter.to2Decimal(pump.getBaseBasalRate()) + "U/h)";
@@ -1072,15 +1165,10 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
 
         final ExtendedBolus extendedBolus = MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis());
         String extendedBolusText = "";
-        if (extendedBolus != null && !pump.isFakingTempsByExtendedBoluses()) {
-            extendedBolusText = extendedBolus.toString();
-        }
         if (extendedBolusView != null) { // must not exists in all layouts
             if (shorttextmode) {
                 if (extendedBolus != null && !pump.isFakingTempsByExtendedBoluses()) {
                     extendedBolusText = DecimalFormatter.to2Decimal(extendedBolus.absoluteRate()) + "U/h";
-                } else {
-                    extendedBolusText = "";
                 }
                 extendedBolusView.setText(extendedBolusText);
                 extendedBolusView.setOnClickListener(new View.OnClickListener() {
@@ -1091,8 +1179,15 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 });
 
             } else {
+                if (extendedBolus != null && !pump.isFakingTempsByExtendedBoluses()) {
+                    extendedBolusText = extendedBolus.toString();
+                }
                 extendedBolusView.setText(extendedBolusText);
             }
+            if (extendedBolusText.equals(""))
+                extendedBolusView.setVisibility(View.GONE);
+            else
+                extendedBolusView.setVisibility(View.VISIBLE);
         }
 
         activeProfileView.setText(MainApp.getConfigBuilder().getProfileName());
@@ -1113,12 +1208,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();
+            BolusWizard wizard = quickWizardEntry.doCalc(profile, tempTarget, lastBG, false);
-            wizard.doCalc(profile, tempTarget, quickWizardEntry.carbs(), 0d, lastBG.valueToUnits(units), 0d, true, true, false, false);
             text += " " + DecimalFormatter.to2Decimal(wizard.calculatedTotalInsulin) + "U";
             quickWizardButton.setText(text);
             if (wizard.calculatedTotalInsulin <= 0)
@@ -1136,16 +1230,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();
@@ -1192,19 +1278,19 @@ 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("Overview COB");
             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 = showPredictionCheckbox.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);
+            showPredictionCheckbox.setVisibility(View.VISIBLE);
-            getActivity().findViewById(R.id.overview_showprediction_label).setVisibility(View.VISIBLE);
+            showPredictionLabel.setVisibility(View.VISIBLE);
         } else {
-            showPredictionView.setVisibility(View.GONE);
+            showPredictionCheckbox.setVisibility(View.GONE);
-            getActivity().findViewById(R.id.overview_showprediction_label).setVisibility(View.GONE);
+            showPredictionLabel.setVisibility(View.GONE);
         }
 
         // pump status from ns
@@ -1242,6 +1328,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());
@@ -1251,9 +1340,9 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 calendar.add(Calendar.HOUR, 1);
 
                 int hoursToFetch;
-        long toTime;
+                final long toTime;
-        long fromTime;
+                final long fromTime;
-        long endTime;
+                final long endTime;
                 if (showPrediction) {
                     int predHours = (int) (Math.ceil(((DetermineBasalResultAMA) finalLastRun.constraintsProcessed).getLatestPredictionsTime() - System.currentTimeMillis()) / (60 * 60 * 1000));
                     predHours = Math.min(2, predHours);
@@ -1270,77 +1359,90 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 }
 
 
-        long now = System.currentTimeMillis();
+                final long now = System.currentTimeMillis();
 
-        // 2nd graph
+                //  ------------------ 1st graph
-        // remove old data
+                Profiler.log(log, from + " - 1st graph - START", updateGUIStart);
-        iobGraph.getSeries().clear();
 
-        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 && showBasalsCheckbox.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;
                 boolean useDevForScale = false;
                 boolean useRatioForScale = false;
 
-        if (showIobView.isChecked()) {
+                if (showIobCheckbox.isChecked()) {
                     useIobForScale = true;
-        } else if (showCobView.isChecked()) {
+                } else if (showCobCheckbox.isChecked()) {
                     useCobForScale = true;
-        } else if (showDeviationsView.isChecked()) {
+                } else if (showDeviationsCheckbox.isChecked()) {
                     useDevForScale = true;
-        } else if (showRatiosView.isChecked()) {
+                } else if (showRatiosCheckbox.isChecked()) {
                     useRatioForScale = true;
                 }
 
-        if (showIobView.isChecked())
+                if (showIobCheckbox.isChecked())
-            secondGraphData.addIob(iobGraph, fromTime, now, useIobForScale, 1d);
+                    secondGraphData.addIob(fromTime, now, useIobForScale, 1d);
-        if (showCobView.isChecked())
+                if (showCobCheckbox.isChecked())
-            secondGraphData.addCob(iobGraph, fromTime, now, useCobForScale, useCobForScale ? 1d : 0.5d);
+                    secondGraphData.addCob(fromTime, now, useCobForScale, useCobForScale ? 1d : 0.5d);
-        if (showDeviationsView.isChecked())
+                if (showDeviationsCheckbox.isChecked())
-            secondGraphData.addDeviations(iobGraph, fromTime, now, useDevForScale, 1d);
+                    secondGraphData.addDeviations(fromTime, now, useDevForScale, 1d);
-        if (showRatiosView.isChecked())
+                if (showRatiosCheckbox.isChecked())
-            secondGraphData.addRatio(iobGraph, fromTime, now, useRatioForScale, 1d);
+                    secondGraphData.addRatio(fromTime, now, useRatioForScale, 1d);
 
-        if (showIobView.isChecked() || showCobView.isChecked() || showDeviationsView.isChecked() || showRatiosView.isChecked()) {
+                // **** 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 (showIobCheckbox.isChecked() || showCobCheckbox.isChecked() || showDeviationsCheckbox.isChecked() || showRatiosCheckbox.isChecked()) {
                                 iobGraph.setVisibility(View.VISIBLE);
                             } else {
                                 iobGraph.setVisibility(View.GONE);
                             }
-
+                            // finally enforce drawing of graphs
-        // remove old data from graph
+                            graphData.performUpdate();
-        bgGraph.getSeries().clear();
+                            secondGraphData.performUpdate();
-
+                            Profiler.log(log, from + " - onDataChanged", updateGUIStart);
-        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);
                         }
-
+                    });
-        // **** NOW line ****
+                }
-        graphData.addNowLine(bgGraph, now);
+            }
-        secondGraphData.addNowLine(iobGraph, now);
+        }).start();
-
-        // finaly enforce drawing of graphs
-        bgGraph.onDataChanged(false, false);
-        iobGraph.onDataChanged(false, false);
 
         Profiler.log(log, from, updateGUIStart);
     }
@@ -1426,6 +1528,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 }
             }
         }
+
     }
 
     void updateNotifications() {

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

@@ -9,10 +9,12 @@ 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;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
+import info.nightscout.androidaps.plugins.Overview.notifications.NotificationStore;
 import info.nightscout.utils.SP;
 
 /**

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/events/EventNewNotification.java

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.Overview.events;
 
 import info.nightscout.androidaps.events.Event;
-import info.nightscout.androidaps.plugins.Overview.Notification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 
 /**
  * Created by mike on 03.12.2016.

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

@@ -24,9 +24,10 @@ import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.db.ExtendedBolus;
 import info.nightscout.androidaps.db.ProfileSwitch;
 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;
@@ -44,15 +45,18 @@ import info.nightscout.utils.Round;
 
 public class GraphData {
 
-    public GraphData() {
+    private GraphView graph;
-        units = MainApp.getConfigBuilder().getProfileUnits();
-    }
-
     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<>();
@@ -80,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);
+        graph.getViewport().setMaxY(maxY);
-        bgGraph.getViewport().setMinY(0);
+        graph.getViewport().setMinY(0);
-        bgGraph.getViewport().setYAxisBoundsManual(true);
+        graph.getViewport().setYAxisBoundsManual(true);
-        bgGraph.getGridLabelRenderer().setNumVerticalLabels(numOfVertLines);
+        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[]{
@@ -101,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;
@@ -193,7 +196,7 @@ public class GraphData {
         basalsLineSeries = new LineGraphSeries<>(basalLine);
         Paint paint = new Paint();
         paint.setStyle(Paint.Style.STROKE);
-        paint.setStrokeWidth(2);
+        paint.setStrokeWidth(MainApp.instance().getApplicationContext().getResources().getDisplayMetrics().scaledDensity * 2);
         paint.setPathEffect(new DashPathEffect(new float[]{2, 4}, 0));
         paint.setColor(MainApp.sResources.getColor(R.color.basal));
         basalsLineSeries.setCustomPaint(paint);
@@ -203,19 +206,19 @@ public class GraphData {
         absoluteBasalsLineSeries = new LineGraphSeries<>(absoluteBasalLine);
         Paint absolutePaint = new Paint();
         absolutePaint.setStyle(Paint.Style.STROKE);
-        absolutePaint.setStrokeWidth(4);
+        absolutePaint.setStrokeWidth(MainApp.instance().getApplicationContext().getResources().getDisplayMetrics().scaledDensity * 2);
         absolutePaint.setColor(MainApp.sResources.getColor(R.color.basal));
         absoluteBasalsLineSeries.setCustomPaint(absolutePaint);
 
         basalScale.setMultiplier(maxY * scale / maxBasalValueFound);
 
-        addSeriesWithoutInvalidate(bgGraph, baseBasalsSeries);
+        addSeries(baseBasalsSeries);
-        addSeriesWithoutInvalidate(bgGraph, tempBasalsSeries);
+        addSeries(tempBasalsSeries);
-        addSeriesWithoutInvalidate(bgGraph, basalsLineSeries);
+        addSeries(basalsLineSeries);
-        addSeriesWithoutInvalidate(bgGraph, absoluteBasalsLineSeries);
+        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();
@@ -237,7 +240,7 @@ public class GraphData {
         }
 
         // Extended bolus
-        if (!MainApp.getConfigBuilder().isFakingTempsByExtendedBoluses()) {
+        if (!ConfigBuilderPlugin.getActivePump().isFakingTempsByExtendedBoluses()) {
             List<ExtendedBolus> extendedBoluses = MainApp.getConfigBuilder().getExtendedBolusesFromHistory().getList();
 
             for (int tx = 0; tx < extendedBoluses.size(); tx++) {
@@ -250,7 +253,7 @@ public class GraphData {
         }
 
         // Careportal
-        List<CareportalEvent> careportalEvents = MainApp.getDbHelper().getCareportalEventsFromTime(fromTime, true);
+        List<CareportalEvent> careportalEvents = MainApp.getDbHelper().getCareportalEventsFromTime(fromTime - 6 * 60 * 60 * 1000, true);
 
         for (int tx = 0; tx < careportalEvents.size(); tx++) {
             DataPointWithLabelInterface t = careportalEvents.get(tx);
@@ -261,9 +264,7 @@ public class GraphData {
 
         DataPointWithLabelInterface[] treatmentsArray = new DataPointWithLabelInterface[filteredTreatments.size()];
         treatmentsArray = filteredTreatments.toArray(treatmentsArray);
-        if (treatmentsArray.length > 0) {
+        addSeries(new PointsWithLabelGraphSeries<>(treatmentsArray));
-            addSeriesWithoutInvalidate(bgGraph, new PointsWithLabelGraphSeries<>(treatmentsArray));
-        }
     }
 
     double getNearestBg(long date) {
@@ -278,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;
@@ -309,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;
@@ -348,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;
 
@@ -395,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;
@@ -425,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),
@@ -446,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);
@@ -457,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);
+                s.onGraphViewAttached(graph);
-            bgGraph.getSeries().add(s);
+                graph.getSeries().add(s);
             }
         }
         
+        // draw it
+        graph.onDataChanged(false, false);
+    }
 }

app/src/main/java/info/nightscout/androidaps/plugins/Overview/graphExtensions/PointsWithLabelGraphSeries.java

@@ -30,7 +30,10 @@ import android.graphics.Path;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.Typeface;
-
+import android.util.TypedValue;
+// Added by Rumen for scalable text 
+import android.content.Context;
+import info.nightscout.androidaps.MainApp;
 import com.jjoe64.graphview.GraphView;
 import com.jjoe64.graphview.series.BaseSeries;
 
@@ -44,6 +47,13 @@ import java.util.Iterator;
  * @author jjoe64
  */
 public class PointsWithLabelGraphSeries<E extends DataPointWithLabelInterface> extends BaseSeries<E> {
+    // Default spSize
+    int spSize = 12;
+    // Convert the sp to pixels
+    Context context = MainApp.instance().getApplicationContext();
+    float scaledTextSize = spSize * context.getResources().getDisplayMetrics().scaledDensity;
+    float scaledPxSize = context.getResources().getDisplayMetrics().scaledDensity * 1.5f;
+
     /**
      * choose a predefined shape to render for
      * each data point.
@@ -131,9 +141,6 @@ public class PointsWithLabelGraphSeries<E extends DataPointWithLabelInterface> e
         Iterator<E> values = getValues(minX, maxX);
 
         // draw background
-        double lastEndY = 0;
-        double lastEndX = 0;
-
         // draw data
 
         double diffY = maxY - minY;
@@ -144,9 +151,8 @@ public class PointsWithLabelGraphSeries<E extends DataPointWithLabelInterface> e
         float graphLeft = graphView.getGraphContentLeft();
         float graphTop = graphView.getGraphContentTop();
 
-        lastEndY = 0;
+        float scaleX = (float) (graphWidth / diffX);
-        lastEndX = 0;
+
-        float firstX = 0;
         int i=0;
         while (values.hasNext()) {
             E value = values.next();
@@ -161,9 +167,6 @@ public class PointsWithLabelGraphSeries<E extends DataPointWithLabelInterface> e
             double ratX = valX / diffX;
             double x = graphWidth * ratX;
 
-            double orgX = x;
-            double orgY = y;
-
             // overdraw
             boolean overdraw = false;
             if (x > graphWidth) { // end right
@@ -175,6 +178,14 @@ public class PointsWithLabelGraphSeries<E extends DataPointWithLabelInterface> e
             if (y > graphHeight) { // end top
                 overdraw = true;
             }
+
+            long duration = value.getDuration();
+            float endWithDuration = (float) (x + duration * scaleX + graphLeft + 1);
+            // cut off to graph start if needed
+            if (x < 0 && endWithDuration > 0) {
+                x = 0;
+            }
+
             /* Fix a bug that continue to show the DOT after Y axis */
             if(x < 0) {
                 overdraw = true;
@@ -185,30 +196,30 @@ public class PointsWithLabelGraphSeries<E extends DataPointWithLabelInterface> e
             registerDataPoint(endX, endY, value);
 
             float xpluslength = 0;
-            if (value.getDuration() > 0) {
+            if (duration > 0) {
-                xpluslength = endX + Math.min((float) (value.getDuration() * graphWidth / diffX), graphLeft + graphWidth);
+                xpluslength = Math.min(endWithDuration, graphLeft + graphWidth);
             }
 
             // draw data point
             if (!overdraw) {
                 if (value.getShape() == Shape.POINT) {
                     mPaint.setStrokeWidth(0);
-                    canvas.drawCircle(endX, endY, value.getSize(), mPaint);
+                    canvas.drawCircle(endX, endY, scaledPxSize, mPaint);
                 } else if (value.getShape() == Shape.RECTANGLE) {
-                    canvas.drawRect(endX-value.getSize(), endY-value.getSize(), endX+value.getSize(), endY+value.getSize(), mPaint);
+                    canvas.drawRect(endX-scaledPxSize, endY-scaledPxSize, endX+scaledPxSize, endY+scaledPxSize, mPaint);
                 } else if (value.getShape() == Shape.TRIANGLE) {
                     mPaint.setStrokeWidth(0);
                     Point[] points = new Point[3];
-                    points[0] = new Point((int)endX, (int)(endY-value.getSize()));
+                    points[0] = new Point((int)endX, (int)(endY-scaledPxSize));
-                    points[1] = new Point((int)(endX+value.getSize()), (int)(endY+value.getSize()*0.67));
+                    points[1] = new Point((int)(endX+scaledPxSize), (int)(endY+scaledPxSize*0.67));
-                    points[2] = new Point((int)(endX-value.getSize()), (int)(endY+value.getSize()*0.67));
+                    points[2] = new Point((int)(endX-scaledPxSize), (int)(endY+scaledPxSize*0.67));
                     drawArrows(points, canvas, mPaint);
                 } else if (value.getShape() == Shape.BOLUS) {
                     mPaint.setStrokeWidth(0);
                     Point[] points = new Point[3];
-                    points[0] = new Point((int)endX, (int)(endY-value.getSize()));
+                    points[0] = new Point((int)endX, (int)(endY-scaledPxSize));
-                    points[1] = new Point((int)(endX+value.getSize()), (int)(endY+value.getSize()*0.67));
+                    points[1] = new Point((int)(endX+scaledPxSize), (int)(endY+scaledPxSize*0.67));
-                    points[2] = new Point((int)(endX-value.getSize()), (int)(endY+value.getSize()*0.67));
+                    points[2] = new Point((int)(endX-scaledPxSize), (int)(endY+scaledPxSize*0.67));
                     mPaint.setStyle(Paint.Style.FILL_AND_STROKE);
                     drawArrows(points, canvas, mPaint);
                     if (value.getLabel() != null) {
@@ -220,7 +231,7 @@ public class PointsWithLabelGraphSeries<E extends DataPointWithLabelInterface> e
                         Rect bounds = new Rect((int)endX, (int)endY + 3, (int) (xpluslength), (int) endY + 8);
                         mPaint.setStyle(Paint.Style.FILL_AND_STROKE);
                         canvas.drawRect(bounds, mPaint);
-                        mPaint.setTextSize((int) (value.getSize() * 2.5));
+                        mPaint.setTextSize((float) (scaledTextSize));
                         mPaint.setTypeface(Typeface.create(Typeface.DEFAULT, Typeface.NORMAL));
                         mPaint.setFakeBoldText(true);
                         canvas.drawText(value.getLabel(), endX, endY, mPaint);
@@ -228,7 +239,8 @@ public class PointsWithLabelGraphSeries<E extends DataPointWithLabelInterface> e
                 } else if (value.getShape() == Shape.PROFILE) {
                     mPaint.setStrokeWidth(0);
                     if (value.getLabel() != null) {
-                        mPaint.setTextSize((int) (value.getSize() * 3));
+                        //mPaint.setTextSize((int) (scaledPxSize * 3));
+                        mPaint.setTextSize((float) (scaledTextSize*1.2));
                         mPaint.setTypeface(Typeface.create(Typeface.DEFAULT, Typeface.BOLD));
                         Rect bounds = new Rect();
                         mPaint.getTextBounds(value.getLabel(), 0, value.getLabel().length(), bounds);
@@ -245,25 +257,25 @@ public class PointsWithLabelGraphSeries<E extends DataPointWithLabelInterface> e
                     mPaint.setStyle(Paint.Style.STROKE);
                     mPaint.setStrokeWidth(5);
                     float w = mPaint.getStrokeWidth();
-                    canvas.drawCircle(endX, endY, value.getSize(), mPaint);
+                    canvas.drawCircle(endX, endY, scaledPxSize, mPaint);
                 } else if (value.getShape() == Shape.BGCHECK) {
                     mPaint.setStyle(Paint.Style.FILL_AND_STROKE);
                     mPaint.setStrokeWidth(0);
-                    canvas.drawCircle(endX, endY, value.getSize(), mPaint);
+                    canvas.drawCircle(endX, endY, scaledPxSize, mPaint);
                     if (value.getLabel() != null) {
                         drawLabel45(endX, endY, value, canvas);
                     }
                 } else if (value.getShape() == Shape.ANNOUNCEMENT) {
                     mPaint.setStyle(Paint.Style.FILL_AND_STROKE);
                     mPaint.setStrokeWidth(0);
-                    canvas.drawCircle(endX, endY, value.getSize(), mPaint);
+                    canvas.drawCircle(endX, endY, scaledPxSize, mPaint);
                     if (value.getLabel() != null) {
                         drawLabel45(endX, endY, value, canvas);
                     }
                 } else if (value.getShape() == Shape.GENERAL) {
                     mPaint.setStyle(Paint.Style.FILL_AND_STROKE);
                     mPaint.setStrokeWidth(0);
-                    canvas.drawCircle(endX, endY, value.getSize(), mPaint);
+                    canvas.drawCircle(endX, endY, scaledPxSize, mPaint);
                     if (value.getLabel() != null) {
                         drawLabel45(endX, endY, value, canvas);
                     }
@@ -271,7 +283,7 @@ public class PointsWithLabelGraphSeries<E extends DataPointWithLabelInterface> e
                     mPaint.setStrokeWidth(0);
                     if (value.getLabel() != null) {
                         mPaint.setStrokeWidth(0);
-                        mPaint.setTextSize((int) (value.getSize() * 3));
+                        mPaint.setTextSize((float) (scaledTextSize * 1.2));
                         mPaint.setTypeface(Typeface.create(Typeface.DEFAULT, Typeface.BOLD));
                         Rect bounds = new Rect();
                         mPaint.getTextBounds(value.getLabel(), 0, value.getLabel().length(), bounds);
@@ -286,7 +298,7 @@ public class PointsWithLabelGraphSeries<E extends DataPointWithLabelInterface> e
                     mPaint.setStrokeWidth(0);
                     if (value.getLabel() != null) {
                         mPaint.setStrokeWidth(0);
-                        mPaint.setTextSize((int) (value.getSize() * 3));
+                        mPaint.setTextSize(scaledTextSize);
                         mPaint.setTypeface(Typeface.create(Typeface.DEFAULT, Typeface.BOLD));
                         Rect bounds = new Rect();
                         mPaint.getTextBounds(value.getLabel(), 0, value.getLabel().length(), bounds);
@@ -301,7 +313,7 @@ public class PointsWithLabelGraphSeries<E extends DataPointWithLabelInterface> e
                     mPaint.setStrokeWidth(0);
                     if (value.getLabel() != null) {
                         mPaint.setStrokeWidth(0);
-                        mPaint.setTextSize((int) (value.getSize() * 3));
+                        mPaint.setTextSize((float) (scaledTextSize * 1.5));
                         mPaint.setTypeface(Typeface.create(Typeface.DEFAULT, Typeface.BOLD));
                         Rect bounds = new Rect();
                         mPaint.getTextBounds(value.getLabel(), 0, value.getLabel().length(), bounds);
@@ -352,25 +364,25 @@ public class PointsWithLabelGraphSeries<E extends DataPointWithLabelInterface> e
     void drawLabel45(float endX, float endY, E value, Canvas canvas) {
         if (value.getLabel().startsWith("~")) {
             float px = endX;
-            float py = endY + value.getSize();
+            float py = endY + scaledPxSize;
             canvas.save();
             canvas.rotate(-45, px, py);
-            mPaint.setTextSize((int) (value.getSize() * 2.5));
+            mPaint.setTextSize((float) (scaledTextSize*0.8));
             mPaint.setTypeface(Typeface.create(Typeface.DEFAULT, Typeface.NORMAL));
             mPaint.setFakeBoldText(true);
             mPaint.setTextAlign(Paint.Align.RIGHT);
-            canvas.drawText(value.getLabel().substring(1), px - value.getSize(), py, mPaint);
+            canvas.drawText(value.getLabel().substring(1), px - scaledPxSize, py, mPaint);
             mPaint.setTextAlign(Paint.Align.LEFT);
             canvas.restore();
         } else {
             float px = endX;
-            float py = endY - value.getSize();
+            float py = endY - scaledPxSize;
             canvas.save();
             canvas.rotate(-45, px, py);
-            mPaint.setTextSize((int) (value.getSize() * 2.5));
+            mPaint.setTextSize((float) (scaledTextSize*0.8));
             mPaint.setTypeface(Typeface.create(Typeface.DEFAULT, Typeface.NORMAL));
             mPaint.setFakeBoldText(true);
-            canvas.drawText(value.getLabel(), px + value.getSize(), py, mPaint);
+            canvas.drawText(value.getLabel(), px + scaledPxSize, py, mPaint);
             canvas.restore();
         }
     }

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

@@ -0,0 +1,36 @@
+package info.nightscout.androidaps.plugins.Overview.notifications;
+
+import android.app.IntentService;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.support.annotation.Nullable;
+
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
+
+public class DismissNotificationService extends IntentService {
+
+    /**
+     * Creates an IntentService.  Invoked by your subclass's constructor.
+     *
+     * @param name Used to name the worker thread, important only for debugging.
+     */
+    public DismissNotificationService(String name) {
+        super(name);
+    }
+
+    public DismissNotificationService(){
+        super("DismissNotificationService");
+    };
+
+    @Override
+    protected void onHandleIntent(@Nullable Intent intent) {
+        MainApp.bus().post(new EventDismissNotification(intent.getIntExtra("alertID", -1)));
+    }
+
+    public static PendingIntent deleteIntent(int id){
+        Intent intent = new Intent(MainApp.instance(), DismissNotificationService.class);
+        intent.putExtra("alertID", id);
+        return PendingIntent.getService(MainApp.instance(), id, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+    }
+}

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

@@ -1,5 +1,8 @@
 
-package info.nightscout.androidaps.plugins.Overview;
+package info.nightscout.androidaps.plugins.Overview.notifications;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.Date;
 
@@ -11,8 +14,7 @@ import info.nightscout.androidaps.plugins.NSClientInternal.data.NSSettingsStatus
 import info.nightscout.utils.SP;
 
 // Added by Rumen for debugging
-import org.slf4j.Logger;
+
-import org.slf4j.LoggerFactory;
 /**
  * Created by mike on 03.12.2016.
  */
@@ -50,7 +52,13 @@ public class Notification {
     public static final int SHORT_DIA = 21;
     public static final int TOAST_ALARM = 22;
     public static final int WRONGBASALSTEP = 23;
-    public static final int BOLUS_DELIVERY_ERROR = 24;
+    public static final int WRONG_DRIVER = 24;
+    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 int id;
     public Date date;
@@ -60,7 +68,6 @@ public class Notification {
 
     public NSAlarm nsAlarm = null;
     public Integer soundId = null;
-
     public Notification() {
     }
 
@@ -88,6 +95,27 @@ public class Notification {
         this.validTo = new Date(0);
     }
 
+    public Notification(int id) {
+        this.id = id;
+        this.date = new Date();
+        this.validTo = new Date(0);
+    }
+
+    public Notification text(String text) {
+        this.text = text;
+        return this;
+    }
+
+    public Notification level(int level) {
+        this.level = level;
+        return this;
+    }
+
+    public Notification sound(int soundId) {
+        this.soundId = soundId;
+        return this;
+    }
+
     public Notification(NSAlarm nsAlarm) {
         this.date = new Date();
         this.validTo = new Date(0);
@@ -121,8 +149,7 @@ public class Notification {
             return true;
         if (level == ANNOUNCEMENT)
             return true;
-        if (level == NORMAL && isAlarmForLow() && SP.getBoolean(R.string.key_nsalarm_low, false) || isAlarmForHigh() && SP.getBoolean(R.string.key_nsalarm_high, false) || isAlarmForStaleData() && SP.getBoolean(R.string.key_nsalarm_staledata, false))
+        if (level == NORMAL && isAlarmForLow() && SP.getBoolean(R.string.key_nsalarm_low, false) || isAlarmForHigh() && SP.getBoolean(R.string.key_nsalarm_high, false) || isAlarmForStaleData() && SP.getBoolean(R.string.key_nsalarm_staledata, false)) {
-        {   
             return true;
         }
         if (level == URGENT && isAlarmForLow() && SP.getBoolean(R.string.key_nsalarm_urgent_low, false) || isAlarmForHigh() && SP.getBoolean(R.string.key_nsalarm_urgent_high, false) || isAlarmForStaleData() && SP.getBoolean(R.string.key_nsalarm_urgent_staledata, false))
@@ -154,8 +181,9 @@ public class Notification {
         return false;
     }
 
-    static boolean isAlarmForStaleData(){
+    public static boolean isAlarmForStaleData(){
-        if(SP.getLong("snoozedTo", 0L) != 0L){
+        long snoozedTo = SP.getLong("snoozedTo", 0L);
+        if(snoozedTo != 0L){
             if(System.currentTimeMillis() < SP.getLong("snoozedTo", 0L)) {
                 //log.debug("Alarm is snoozed for next "+(SP.getLong("snoozedTo", 0L)-System.currentTimeMillis())/1000+" seconds");
                 return false;
@@ -168,10 +196,11 @@ public class Notification {
         int bgReadingAgoMin = (int) (bgReadingAgo / (1000 * 60));
         // Added for testing
         // bgReadingAgoMin = 20;
-        log.debug("bgReadingAgoMin value is:"+bgReadingAgoMin);
-        Double threshold = NSSettingsStatus.getInstance().getThreshold("alarmTimeagoWarnMins");
         boolean openAPSEnabledAlerts = NSSettingsStatus.getInstance().openAPSEnabledAlerts();
-		log.debug("OpenAPS Alerts enabled: "+openAPSEnabledAlerts);
+        //log.debug("bgReadingAgoMin value is:"+bgReadingAgoMin);
+        //log.debug("Stale alarm snoozed to: "+(System.currentTimeMillis() - snoozedTo)/60000L);
+        Double threshold = NSSettingsStatus.getInstance().getThreshold("alarmTimeagoWarnMins");
+	//log.debug("OpenAPS Alerts enabled: "+openAPSEnabledAlerts);
 	// if no thresshold from Ns get it loccally
         if(threshold == null) threshold = SP.getDouble(R.string.key_nsalarm_staledatavalue,15D);
 	// No threshold of OpenAPS Alarm so using the one for BG 

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

@@ -1,6 +1,14 @@
-package info.nightscout.androidaps.plugins.Overview;
+package info.nightscout.androidaps.plugins.Overview.notifications;
 
+import android.app.NotificationManager;
+import android.content.Context;
 import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.media.AudioAttributes;
+import android.media.RingtoneManager;
+import android.net.Uri;
+import android.support.v4.app.NotificationCompat;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -8,7 +16,6 @@ import org.slf4j.LoggerFactory;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.Date;
 import java.util.List;
 
 import info.nightscout.androidaps.MainApp;
@@ -26,6 +33,7 @@ public class NotificationStore {
     private static Logger log = LoggerFactory.getLogger(NotificationStore.class);
     public List<Notification> store = new ArrayList<Notification>();
     public long snoozedUntil = 0L;
+
     public NotificationStore() {
     }
 
@@ -49,21 +57,45 @@ public class NotificationStore {
                 return;
             }
         }
+        store.add(n);
+
+        if (SP.getBoolean(MainApp.sResources.getString(R.string.key_raise_notifications_as_android_notifications), false)) {
+            raiseSystemNotification(n);
+        } else {
             if (n.soundId != null) {
                 Intent alarm = new Intent(MainApp.instance().getApplicationContext(), AlarmSoundService.class);
                 alarm.putExtra("soundid", n.soundId);
                 MainApp.instance().startService(alarm);
             }
-        store.add(n);
-
-        WearPlugin wearPlugin = MainApp.getSpecificPlugin(WearPlugin.class);
-        if(wearPlugin!= null && wearPlugin.isEnabled()) {
-            wearPlugin.overviewNotification(n.id, "OverviewNotification:\n" + n.text);
         }
 
         Collections.sort(store, new NotificationComparator());
     }
 
+    private void raiseSystemNotification(Notification n) {
+        Context context = MainApp.instance().getApplicationContext();
+        NotificationManager mgr = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        Bitmap largeIcon = BitmapFactory.decodeResource(context.getResources(), R.mipmap.blueowl);
+        Uri sound = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_ALARM);
+        NotificationCompat.Builder notificationBuilder =
+                new NotificationCompat.Builder(context)
+                        .setSmallIcon(R.drawable.ic_notification)
+                        .setLargeIcon(largeIcon)
+                        .setContentText(n.text)
+                        .setPriority(NotificationCompat.PRIORITY_MAX)
+                        .setDeleteIntent(DismissNotificationService.deleteIntent(n.id));
+        if (n.level == Notification.URGENT) {
+            notificationBuilder.setVibrate(new long[]{1000, 1000, 1000, 1000})
+                    .setContentTitle(MainApp.sResources.getString(R.string.urgent_alarm))
+                    .setSound(sound, AudioAttributes.USAGE_ALARM);
+        } else {
+            notificationBuilder.setVibrate(new long[]{0, 100, 50, 100, 50})
+                    .setContentTitle(MainApp.sResources.getString(R.string.info))
+            ;
+        }
+        mgr.notify(n.id, notificationBuilder.build());
+    }
+
     public boolean remove(int id) {
         for (int i = 0; i < store.size(); i++) {
             if (get(i).id == id) {

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

@@ -7,7 +7,7 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.support.v4.app.TaskStackBuilder;
-import android.support.v7.app.NotificationCompat;
+import android.support.v4.app.NotificationCompat;
 
 import com.squareup.otto.Subscribe;
 
@@ -29,7 +29,7 @@ import info.nightscout.androidaps.events.EventRefreshOverview;
 import info.nightscout.androidaps.events.EventTempBasalChange;
 import info.nightscout.androidaps.events.EventTreatmentChange;
 import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PumpInterface;
+import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.utils.DecimalFormatter;
 
 /**
@@ -139,10 +139,8 @@ public class PersistentNotificationPlugin implements PluginBase {
             }
         }
 
-        PumpInterface pump = MainApp.getConfigBuilder();
-
-        if (MainApp.getConfigBuilder().isTempBasalInProgress()) {
         TemporaryBasal activeTemp = MainApp.getConfigBuilder().getTempBasalFromHistory(System.currentTimeMillis());
+        if (activeTemp != null) {
             line1 += "  " + activeTemp.toStringShort();
         }
 
@@ -157,7 +155,7 @@ public class PersistentNotificationPlugin implements PluginBase {
                 + ctx.getString(R.string.basal) + ": " + DecimalFormatter.to2Decimal(basalIob.basaliob) + "U)";
 
 
-        String line3 = DecimalFormatter.to2Decimal(pump.getBaseBasalRate()) + " U/h";
+        String line3 = DecimalFormatter.to2Decimal(ConfigBuilderPlugin.getActivePump().getBaseBasalRate()) + " U/h";
 
 
         line3 += " - " + MainApp.getConfigBuilder().getProfileName();

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

@@ -35,11 +35,11 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.events.EventInitializationChanged;
 import info.nightscout.androidaps.events.EventProfileSwitchChange;
-import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.Careportal.CareportalFragment;
 import info.nightscout.androidaps.plugins.Careportal.Dialogs.NewNSTreatmentDialog;
 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.DecimalFormatter;
 import info.nightscout.utils.SafeParse;
 
@@ -151,8 +151,7 @@ public class CircadianPercentageProfileFragment extends SubscriberFragment {
         iceditIcon = (ImageView) layout.findViewById(R.id.circadianpercentageprofile_icedit);
         isfeditIcon = (ImageView) layout.findViewById(R.id.circadianpercentageprofile_isfedit);
 
-        PumpInterface pump = MainApp.getConfigBuilder();
+        if (!ConfigBuilderPlugin.getActivePump().getPumpDescription().isTempBasalCapable) {
-        if (!pump.getPumpDescription().isTempBasalCapable) {
             layout.findViewById(R.id.circadianpercentageprofile_baseprofilebasal_layout).setVisibility(View.GONE);
         }
 
@@ -334,7 +333,8 @@ public class CircadianPercentageProfileFragment extends SubscriberFragment {
         adb.setPositiveButton("MIGRATE", new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialog, int which) {
                 CircadianPercentageProfilePlugin.migrateToLP();
-            } });
+            }
+        });
         adb.setNegativeButton("Cancel", null);
         adb.show();
     }
@@ -522,7 +522,7 @@ public class CircadianPercentageProfileFragment extends SubscriberFragment {
             activity.runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
-                    if (!MainApp.getConfigBuilder().isInitialized() || MainApp.getConfigBuilder().isSuspended()) {
+                    if (!ConfigBuilderPlugin.getActivePump().isInitialized() || ConfigBuilderPlugin.getActivePump().isSuspended()) {
                         profileswitchButton.setVisibility(View.GONE);
                     } else {
                         profileswitchButton.setVisibility(View.VISIBLE);

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

@@ -16,12 +16,10 @@ 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.interfaces.PluginBase;
 import info.nightscout.androidaps.interfaces.ProfileInterface;
-import info.nightscout.androidaps.data.ProfileStore;
-import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.Careportal.Dialogs.NewNSTreatmentDialog;
-import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.ProfileLocal.LocalProfilePlugin;
 import info.nightscout.utils.DecimalFormatter;
 import info.nightscout.utils.NSUpload;
@@ -164,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) {
@@ -184,13 +179,9 @@ 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 PumpInterface pump = MainApp.getConfigBuilder();
         final Profile profile = MainApp.getConfigBuilder().getProfile();
 
-        if (pump == null || profile == null || profile.getBasal() == null){
+        if (profile == null || profile.getBasal() == null) {
             msg += MainApp.sResources.getString(R.string.cpp_notloadedplugins) + "\n";
         }
         if (!"".equals(msg)) {
@@ -353,6 +344,9 @@ public class CircadianPercentageProfilePlugin implements PluginBase, ProfileInte
 
     @Override
     public ProfileStore getProfile() {
+        if (convertedProfile == null)
+            createConvertedProfile();
+
         performLimitCheck();
         return convertedProfile;
     }
@@ -364,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

@@ -11,6 +11,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.RadioButton;
+import android.widget.TextView;
 
 import com.crashlytics.android.Crashlytics;
 import com.squareup.otto.Subscribe;
@@ -22,12 +23,15 @@ import java.text.DecimalFormat;
 
 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.EventInitializationChanged;
-import info.nightscout.androidaps.interfaces.PumpInterface;
+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;
 import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
+import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.utils.DecimalFormatter;
 import info.nightscout.utils.NumberPicker;
 import info.nightscout.utils.SafeParse;
@@ -36,12 +40,6 @@ import info.nightscout.utils.TimeListEdit;
 public class LocalProfileFragment extends SubscriberFragment {
     private static Logger log = LoggerFactory.getLogger(LocalProfileFragment.class);
 
-    private static LocalProfilePlugin localProfilePlugin = new LocalProfilePlugin();
-
-    public static LocalProfilePlugin getPlugin() {
-        return localProfilePlugin;
-    }
-
     NumberPicker diaView;
     RadioButton mgdlView;
     RadioButton mmolView;
@@ -50,6 +48,7 @@ public class LocalProfileFragment extends SubscriberFragment {
     TimeListEdit basalView;
     TimeListEdit targetView;
     Button profileswitchButton;
+    TextView invalidProfile;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -58,10 +57,11 @@ public class LocalProfileFragment extends SubscriberFragment {
             Runnable save = new Runnable() {
                 @Override
                 public void run() {
-                    localProfilePlugin.storeSettings();
+                    LocalProfilePlugin.getPlugin().storeSettings();
                     if (basalView != null) {
                         basalView.updateLabel(MainApp.sResources.getString(R.string.nsprofileview_basal_label) + ": " + getSumLabel());
                     }
+                    updateGUI();
                 }
             };
 
@@ -79,48 +79,49 @@ public class LocalProfileFragment extends SubscriberFragment {
                 @Override
                 public void onTextChanged(CharSequence s, int start,
                                           int before, int count) {
-                    localProfilePlugin.dia = SafeParse.stringToDouble(diaView.getText().toString());
+                    LocalProfilePlugin.getPlugin().dia = SafeParse.stringToDouble(diaView.getText().toString());
-                    localProfilePlugin.storeSettings();
+                    LocalProfilePlugin.getPlugin().storeSettings();
+                    updateGUI();
                 }
             };
 
+            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);
+            diaView.setParams(LocalProfilePlugin.getPlugin().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);
+            icView = new TimeListEdit(getContext(), layout, R.id.localprofile_ic, MainApp.sResources.getString(R.string.nsprofileview_ic_label) + ":", LocalProfilePlugin.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.1d, new DecimalFormat("0.0"), save);
+            isfView = new TimeListEdit(getContext(), layout, R.id.localprofile_isf, MainApp.sResources.getString(R.string.nsprofileview_isf_label) + ":", LocalProfilePlugin.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, 0.01d, new DecimalFormat("0.00"), save);
+            basalView = new TimeListEdit(getContext(), layout, R.id.localprofile_basal, MainApp.sResources.getString(R.string.nsprofileview_basal_label) + ": " + getSumLabel(), LocalProfilePlugin.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, 0.1d, new DecimalFormat("0.0"), save);
+            targetView = new TimeListEdit(getContext(), layout, R.id.localprofile_target, MainApp.sResources.getString(R.string.nsprofileview_target_label) + ":", LocalProfilePlugin.getPlugin().targetLow, LocalProfilePlugin.getPlugin().targetHigh, 3d, 200, 0.1d, new DecimalFormat("0.0"), save);
             profileswitchButton = (Button) layout.findViewById(R.id.localprofile_profileswitch);
+            invalidProfile = (TextView) layout.findViewById(R.id.invalidprofile);
 
-            PumpInterface pump = MainApp.getConfigBuilder();
+            if (!ConfigBuilderPlugin.getActivePump().getPumpDescription().isTempBasalCapable) {
-            if (!pump.getPumpDescription().isTempBasalCapable) {
                 layout.findViewById(R.id.localprofile_basal).setVisibility(View.GONE);
             }
 
-            updateGUI();
+            mgdlView.setChecked(LocalProfilePlugin.getPlugin().mgdl);
-
+            mmolView.setChecked(LocalProfilePlugin.getPlugin().mmol);
-            mgdlView.setChecked(localProfilePlugin.mgdl);
-            mmolView.setChecked(localProfilePlugin.mmol);
 
             mgdlView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    localProfilePlugin.mgdl = mgdlView.isChecked();
+                    LocalProfilePlugin.getPlugin().mgdl = mgdlView.isChecked();
-                    localProfilePlugin.mmol = !localProfilePlugin.mgdl;
+                    LocalProfilePlugin.getPlugin().mmol = !LocalProfilePlugin.getPlugin().mgdl;
-                    mmolView.setChecked(localProfilePlugin.mmol);
+                    mmolView.setChecked(LocalProfilePlugin.getPlugin().mmol);
-                    localProfilePlugin.storeSettings();
+                    LocalProfilePlugin.getPlugin().storeSettings();
                 }
             });
             mmolView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    localProfilePlugin.mmol = mmolView.isChecked();
+                    LocalProfilePlugin.getPlugin().mmol = mmolView.isChecked();
-                    localProfilePlugin.mgdl = !localProfilePlugin.mmol;
+                    LocalProfilePlugin.getPlugin().mgdl = !LocalProfilePlugin.getPlugin().mmol;
-                    mgdlView.setChecked(localProfilePlugin.mgdl);
+                    mgdlView.setChecked(LocalProfilePlugin.getPlugin().mgdl);
-                    localProfilePlugin.storeSettings();
+                    LocalProfilePlugin.getPlugin().storeSettings();
                 }
             });
 
@@ -136,7 +137,6 @@ public class LocalProfileFragment extends SubscriberFragment {
             });
 
 
-            updateGUI();
             return layout;
         } catch (Exception e) {
             log.error("Unhandled exception: ", e);
@@ -148,7 +148,11 @@ public class LocalProfileFragment extends SubscriberFragment {
 
     @NonNull
     public String getSumLabel() {
-        return " ∑" + DecimalFormatter.to2Decimal(localProfilePlugin.getProfile().getDefaultProfile().baseBasalSum()) +"U";
+        ProfileStore profile = LocalProfilePlugin.getPlugin().getProfile();
+        if (profile != null)
+            return " ∑" + DecimalFormatter.to2Decimal(profile.getDefaultProfile().baseBasalSum()) + "U";
+        else
+            return MainApp.gs(R.string.localprofile);
     }
 
     @Subscribe
@@ -163,11 +167,16 @@ public class LocalProfileFragment extends SubscriberFragment {
             activity.runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
-                    if (!MainApp.getConfigBuilder().isInitialized() || MainApp.getConfigBuilder().isSuspended()) {
+                    boolean isValid = LocalProfilePlugin.getPlugin().getProfile() != null && LocalProfilePlugin.getPlugin().getProfile().getDefaultProfile().isValid(MainApp.gs(R.string.localprofile));
+                    if (!ConfigBuilderPlugin.getActivePump().isInitialized() || ConfigBuilderPlugin.getActivePump().isSuspended() || !isValid) {
                         profileswitchButton.setVisibility(View.GONE);
                     } else {
                         profileswitchButton.setVisibility(View.VISIBLE);
                     }
+                    if (isValid)
+                        invalidProfile.setVisibility(View.GONE);
+                    else
+                        invalidProfile.setVisibility(View.VISIBLE);
                 }
             });
     }

app/src/main/java/info/nightscout/androidaps/plugins/ProfileLocal/LocalProfilePlugin.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.DecimalFormatter;
 import info.nightscout.utils.SP;
 
@@ -26,6 +26,14 @@ public class LocalProfilePlugin implements PluginBase, ProfileInterface {
     public static final String LOCAL_PROFILE = "LocalProfile";
     private static Logger log = LoggerFactory.getLogger(LocalProfilePlugin.class);
 
+    private static LocalProfilePlugin localProfilePlugin;
+
+    public static LocalProfilePlugin getPlugin() {
+        if (localProfilePlugin == null)
+            localProfilePlugin = new LocalProfilePlugin();
+        return localProfilePlugin;
+    }
+
     private boolean fragmentEnabled = false;
     private boolean fragmentVisible = false;
 
@@ -128,7 +136,7 @@ public class LocalProfilePlugin implements PluginBase, ProfileInterface {
         editor.apply();
         createConvertedProfile();
         if (Config.logPrefsChange)
-            log.debug("Storing settings: " + getProfile().getData().toString());
+            log.debug("Storing settings: " + getRawProfile().getData().toString());
     }
 
     public void loadSettings() {
@@ -178,7 +186,6 @@ public class LocalProfilePlugin implements PluginBase, ProfileInterface {
             } catch (JSONException ignored) {
             }
         }
-        createConvertedProfile();
     }
 
     /*
@@ -244,6 +251,16 @@ public class LocalProfilePlugin implements PluginBase, ProfileInterface {
 
     @Override
     public ProfileStore getProfile() {
+        if (convertedProfile == null)
+            createConvertedProfile();
+        if (!convertedProfile.getDefaultProfile().isValid(MainApp.gs(R.string.localprofile)))
+            return null;
+        return convertedProfile;
+    }
+
+    public ProfileStore getRawProfile() {
+        if (convertedProfile == null)
+            createConvertedProfile();
         return convertedProfile;
     }
 
@@ -254,6 +271,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/NSProfileFragment.java

@@ -84,6 +84,7 @@ public class NSProfileFragment extends SubscriberFragment implements AdapterView
         }
 
         ProfileStore profileStore = NSProfilePlugin.getPlugin().getProfile();
+        if (profileStore != null) {
             ArrayList<CharSequence> profileList = profileStore.getProfileList();
             ArrayAdapter<CharSequence> adapter = new ArrayAdapter<>(getContext(),
                     R.layout.spinner_centered, profileList);
@@ -93,14 +94,17 @@ public class NSProfileFragment extends SubscriberFragment implements AdapterView
                 if (profileList.get(p).equals(MainApp.getConfigBuilder().getProfileName()))
                     profileSpinner.setSelection(p);
             }
-
+        }
     }
 
     @Override
     public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
         String name = parent.getItemAtPosition(position).toString();
 
-        Profile profile = NSProfilePlugin.getPlugin().getProfile().getSpecificProfile(name);
+        ProfileStore store = NSProfilePlugin.getPlugin().getProfile();
+        if (store != null) {
+            Profile profile = store.getSpecificProfile(name);
+            if (profile != null) {
                 units.setText(profile.getUnits());
                 dia.setText(DecimalFormatter.to2Decimal(profile.getDia()) + " h");
                 activeProfile.setText(name);
@@ -109,6 +113,8 @@ public class NSProfileFragment extends SubscriberFragment implements AdapterView
                 basal.setText(profile.getBasalList());
                 target.setText(profile.getTargetList());
             }
+        }
+    }
 
     @Override
     public void onNothingSelected(AdapterView<?> parent) {

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

@@ -18,9 +18,10 @@ import info.nightscout.androidaps.Services.Intents;
 import info.nightscout.androidaps.data.ProfileStore;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.interfaces.ProfileInterface;
-import info.nightscout.androidaps.interfaces.PumpInterface;
+import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.ProfileNS.events.EventNSProfileUpdateGUI;
 import info.nightscout.androidaps.plugins.SmsCommunicator.SmsCommunicatorPlugin;
+import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.utils.SP;
 
 /**
@@ -71,12 +72,12 @@ public class NSProfilePlugin implements PluginBase, ProfileInterface {
 
     @Override
     public boolean isEnabled(int type) {
-        return type == PROFILE && (Config.NSCLIENT || fragmentEnabled);
+        return type == PROFILE && (Config.NSCLIENT || Config.G5UPLOADER|| fragmentEnabled);
     }
 
     @Override
     public boolean isVisibleInTabs(int type) {
-        return type == PROFILE && (Config.NSCLIENT ||fragmentVisible);
+        return type == PROFILE && (Config.NSCLIENT || Config.G5UPLOADER|| fragmentVisible);
     }
 
     @Override
@@ -91,7 +92,7 @@ public class NSProfilePlugin implements PluginBase, ProfileInterface {
 
     @Override
     public boolean showInList(int type) {
-        return !Config.NSCLIENT;
+        return !Config.NSCLIENT && !Config.G5UPLOADER;
     }
 
     @Override
@@ -119,16 +120,17 @@ public class NSProfilePlugin implements PluginBase, ProfileInterface {
         profile = new ProfileStore(newProfile.getData());
         storeNSProfile();
         MainApp.bus().post(new EventNSProfileUpdateGUI());
-        PumpInterface pump = MainApp.getConfigBuilder();
+        ConfigBuilderPlugin.getCommandQueue().setProfile(MainApp.getConfigBuilder().getProfile(), new Callback() {
-        if (SP.getBoolean("syncprofiletopump", false)) {
+            @Override
-            if (pump.setNewBasalProfile(MainApp.getConfigBuilder().getProfile()) == PumpInterface.SUCCESS) {
+            public void run() {
+                if (result.enacted) {
                     SmsCommunicatorPlugin smsCommunicatorPlugin = MainApp.getSpecificPlugin(SmsCommunicatorPlugin.class);
                     if (smsCommunicatorPlugin != null && smsCommunicatorPlugin.isEnabled(PluginBase.GENERAL)) {
                         smsCommunicatorPlugin.sendNotificationToAllNumbers(MainApp.sResources.getString(R.string.profile_set_ok));
                     }
                 }
             }
-
+        });
     }
 
     private static void storeNSProfile() {

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

@@ -11,6 +11,7 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.RadioButton;
+import android.widget.TextView;
 
 import com.crashlytics.android.Crashlytics;
 import com.squareup.otto.Subscribe;
@@ -21,11 +22,11 @@ import org.slf4j.LoggerFactory;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.events.EventInitializationChanged;
-import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.Careportal.CareportalFragment;
 import info.nightscout.androidaps.plugins.Careportal.Dialogs.NewNSTreatmentDialog;
 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.SafeParse;
 
 public class SimpleProfileFragment extends SubscriberFragment {
@@ -40,6 +41,7 @@ public class SimpleProfileFragment extends SubscriberFragment {
     EditText targetlowView;
     EditText targethighView;
     Button profileswitchButton;
+    TextView invalidProfile;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -55,15 +57,13 @@ public class SimpleProfileFragment extends SubscriberFragment {
             targetlowView = (EditText) layout.findViewById(R.id.simpleprofile_targetlow);
             targethighView = (EditText) layout.findViewById(R.id.simpleprofile_targethigh);
             profileswitchButton = (Button) layout.findViewById(R.id.simpleprofile_profileswitch);
+            invalidProfile = (TextView) layout.findViewById(R.id.invalidprofile);
 
-            PumpInterface pump = MainApp.getConfigBuilder();
+            if (!ConfigBuilderPlugin.getActivePump().getPumpDescription().isTempBasalCapable) {
-            if (!pump.getPumpDescription().isTempBasalCapable) {
                 layout.findViewById(R.id.simpleprofile_basalrate).setVisibility(View.GONE);
                 layout.findViewById(R.id.simpleprofile_basalrate_label).setVisibility(View.GONE);
             }
 
-            updateGUI();
-
             mgdlView.setChecked(SimpleProfilePlugin.getPlugin().mgdl);
             mmolView.setChecked(SimpleProfilePlugin.getPlugin().mmol);
             diaView.setText(SimpleProfilePlugin.getPlugin().dia.toString());
@@ -124,6 +124,7 @@ public class SimpleProfileFragment extends SubscriberFragment {
                     SimpleProfilePlugin.getPlugin().targetLow = SafeParse.stringToDouble(targetlowView.getText().toString());
                     SimpleProfilePlugin.getPlugin().targetHigh = SafeParse.stringToDouble(targethighView.getText().toString());
                     SimpleProfilePlugin.getPlugin().storeSettings();
+                    updateGUI();
                 }
             };
 
@@ -134,8 +135,6 @@ public class SimpleProfileFragment extends SubscriberFragment {
             targetlowView.addTextChangedListener(textWatch);
             targethighView.addTextChangedListener(textWatch);
 
-            updateGUI();
-
             return layout;
         } catch (Exception e) {
             Crashlytics.logException(e);
@@ -156,11 +155,16 @@ public class SimpleProfileFragment extends SubscriberFragment {
             activity.runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
-                    if (!MainApp.getConfigBuilder().isInitialized() || MainApp.getConfigBuilder().isSuspended()) {
+                    boolean isValid = SimpleProfilePlugin.getPlugin().getProfile() != null && SimpleProfilePlugin.getPlugin().getProfile().getDefaultProfile().isValid(MainApp.gs(R.string.simpleprofile));
+                    if (!ConfigBuilderPlugin.getActivePump().isInitialized() || ConfigBuilderPlugin.getActivePump().isSuspended() || !isValid) {
                         profileswitchButton.setVisibility(View.GONE);
                     } else {
                         profileswitchButton.setVisibility(View.VISIBLE);
                     }
+                    if (isValid)
+                        invalidProfile.setVisibility(View.GONE);
+                    else
+                        invalidProfile.setVisibility(View.VISIBLE);
                 }
             });
     }

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;
 
 /**
@@ -132,6 +132,8 @@ public class SimpleProfilePlugin implements PluginBase, ProfileInterface {
 
         editor.apply();
         createConvertedProfile();
+        if (Config.logPrefsChange)
+            log.debug("Storing settings: " + getRawProfile().getData().toString());
     }
 
     private void loadSettings() {
@@ -141,12 +143,11 @@ public class SimpleProfilePlugin implements PluginBase, ProfileInterface {
         mgdl = SP.getBoolean("SimpleProfile" + "mgdl", true);
         mmol = SP.getBoolean("SimpleProfile" + "mmol", false);
         dia = SP.getDouble("SimpleProfile" + "dia", Constants.defaultDIA);
-        ic = SP.getDouble("SimpleProfile" + "ic", 20d);
+        ic = SP.getDouble("SimpleProfile" + "ic", 0d);
-        isf = SP.getDouble("SimpleProfile" + "isf", 200d);
+        isf = SP.getDouble("SimpleProfile" + "isf", 0d);
-        basal = SP.getDouble("SimpleProfile" + "basal", 1d);
+        basal = SP.getDouble("SimpleProfile" + "basal", 0d);
-        targetLow = SP.getDouble("SimpleProfile" + "targetlow", 80d);
+        targetLow = SP.getDouble("SimpleProfile" + "targetlow", 0d);
-        targetHigh = SP.getDouble("SimpleProfile" + "targethigh", 120d);
+        targetHigh = SP.getDouble("SimpleProfile" + "targethigh", 0d);
-        createConvertedProfile();
     }
 
     /*
@@ -211,6 +212,16 @@ public class SimpleProfilePlugin implements PluginBase, ProfileInterface {
 
     @Override
     public ProfileStore getProfile() {
+        if (convertedProfile == null)
+            createConvertedProfile();
+        if (!convertedProfile.getDefaultProfile().isValid(MainApp.gs(R.string.simpleprofile)))
+            return null;
+        return convertedProfile;
+    }
+
+    public ProfileStore getRawProfile() {
+        if (convertedProfile == null)
+            createConvertedProfile();
         return convertedProfile;
     }
 

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

@@ -0,0 +1,557 @@
+package info.nightscout.androidaps.plugins.PumpDanaR;
+
+import android.support.annotation.Nullable;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.slf4j.Logger;
+
+import java.util.Date;
+import java.util.Objects;
+
+import info.nightscout.androidaps.BuildConfig;
+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.data.PumpEnactResult;
+import info.nightscout.androidaps.db.ExtendedBolus;
+import info.nightscout.androidaps.db.TemporaryBasal;
+import info.nightscout.androidaps.interfaces.ConstraintsInterface;
+import info.nightscout.androidaps.interfaces.DanaRInterface;
+import info.nightscout.androidaps.interfaces.PluginBase;
+import info.nightscout.androidaps.interfaces.ProfileInterface;
+import info.nightscout.androidaps.interfaces.PumpDescription;
+import info.nightscout.androidaps.interfaces.PumpInterface;
+import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
+import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
+import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
+import info.nightscout.androidaps.plugins.ProfileNS.NSProfilePlugin;
+import info.nightscout.androidaps.plugins.PumpDanaR.services.AbstractDanaRExecutionService;
+import info.nightscout.utils.DateUtil;
+import info.nightscout.utils.DecimalFormatter;
+import info.nightscout.utils.Round;
+
+/**
+ * Created by mike on 28.01.2018.
+ */
+
+public abstract class AbstractDanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, ConstraintsInterface, ProfileInterface {
+    protected Logger log;
+
+    protected boolean mPluginPumpEnabled = false;
+    protected boolean mPluginProfileEnabled = false;
+    protected boolean mFragmentPumpVisible = true;
+
+    protected AbstractDanaRExecutionService sExecutionService;
+
+    protected DanaRPump pump = DanaRPump.getInstance();
+    protected boolean useExtendedBoluses = false;
+
+    public PumpDescription pumpDescription = new PumpDescription();
+
+    @Override
+    public String getFragmentClass() {
+        return DanaRFragment.class.getName();
+    }
+
+    // Plugin base interface
+    @Override
+    public int getType() {
+        return PluginBase.PUMP;
+    }
+
+    @Override
+    public String getNameShort() {
+        String name = MainApp.sResources.getString(R.string.danarpump_shortname);
+        if (!name.trim().isEmpty()) {
+            //only if translation exists
+            return name;
+        }
+        // use long name as fallback
+        return getName();
+    }
+
+    @Override
+    public boolean isEnabled(int type) {
+        if (type == PluginBase.PROFILE) return mPluginProfileEnabled && mPluginPumpEnabled;
+        else if (type == PluginBase.PUMP) return mPluginPumpEnabled;
+        else if (type == PluginBase.CONSTRAINTS) return mPluginPumpEnabled;
+        return false;
+    }
+
+    @Override
+    public boolean isVisibleInTabs(int type) {
+        if (type == PluginBase.PROFILE || type == PluginBase.CONSTRAINTS) return false;
+        else if (type == PluginBase.PUMP) return mFragmentPumpVisible;
+        return false;
+    }
+
+    @Override
+    public boolean canBeHidden(int type) {
+        return true;
+    }
+
+    @Override
+    public boolean hasFragment() {
+        return true;
+    }
+
+    @Override
+    public boolean showInList(int type) {
+        return type == PUMP;
+    }
+
+    @Override
+    public void setFragmentEnabled(int type, boolean fragmentEnabled) {
+        if (type == PluginBase.PROFILE)
+            mPluginProfileEnabled = fragmentEnabled;
+        else if (type == PluginBase.PUMP)
+            mPluginPumpEnabled = fragmentEnabled;
+        // if pump profile was enabled need to switch to another too
+        if (type == PluginBase.PUMP && !fragmentEnabled && mPluginProfileEnabled) {
+            setFragmentEnabled(PluginBase.PROFILE, false);
+            setFragmentVisible(PluginBase.PROFILE, false);
+            NSProfilePlugin.getPlugin().setFragmentEnabled(PluginBase.PROFILE, true);
+            NSProfilePlugin.getPlugin().setFragmentVisible(PluginBase.PROFILE, true);
+        }
+    }
+
+    @Override
+    public void setFragmentVisible(int type, boolean fragmentVisible) {
+        if (type == PluginBase.PUMP)
+            mFragmentPumpVisible = fragmentVisible;
+    }
+
+    @Override
+    public boolean isSuspended() {
+        return pump.pumpSuspended;
+    }
+
+    @Override
+    public boolean isBusy() {
+        if (sExecutionService == null) return false;
+        return sExecutionService.isConnected() || sExecutionService.isConnecting();
+    }
+
+    // Pump interface
+    @Override
+    public PumpEnactResult setNewBasalProfile(Profile profile) {
+        PumpEnactResult result = new PumpEnactResult();
+
+        if (sExecutionService == null) {
+            log.error("setNewBasalProfile sExecutionService is null");
+            result.comment = "setNewBasalProfile sExecutionService is null";
+            return result;
+        }
+        if (!isInitialized()) {
+            log.error("setNewBasalProfile not initialized");
+            Notification notification = new Notification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, MainApp.sResources.getString(R.string.pumpNotInitializedProfileNotSet), Notification.URGENT);
+            MainApp.bus().post(new EventNewNotification(notification));
+            result.comment = MainApp.sResources.getString(R.string.pumpNotInitializedProfileNotSet);
+            return result;
+        } else {
+            MainApp.bus().post(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED));
+        }
+        if (!sExecutionService.updateBasalsInPump(profile)) {
+            Notification notification = new Notification(Notification.FAILED_UDPATE_PROFILE, MainApp.sResources.getString(R.string.failedupdatebasalprofile), Notification.URGENT);
+            MainApp.bus().post(new EventNewNotification(notification));
+            result.comment = MainApp.sResources.getString(R.string.failedupdatebasalprofile);
+            return result;
+        } 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";
+            return result;
+        }
+    }
+
+    @Override
+    public boolean isThisProfileSet(Profile profile) {
+        if (!isInitialized())
+            return true; // TODO: not sure what's better. so far TRUE to prevent too many SMS
+        if (pump.pumpProfiles == null)
+            return true; // TODO: not sure what's better. so far TRUE to prevent too many SMS
+        int basalValues = pump.basal48Enable ? 48 : 24;
+        int basalIncrement = pump.basal48Enable ? 30 * 60 : 60 * 60;
+        for (int h = 0; h < basalValues; h++) {
+            Double pumpValue = pump.pumpProfiles[pump.activeProfile][h];
+            Double profileValue = profile.getBasal((Integer) (h * basalIncrement));
+            if (profileValue == null) return true;
+            if (Math.abs(pumpValue - profileValue) > getPumpDescription().basalStep) {
+                log.debug("Diff found. Hour: " + h + " Pump: " + pumpValue + " Profile: " + profileValue);
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public Date lastDataTime() {
+        return new Date(pump.lastConnection);
+    }
+
+    @Override
+    public double getBaseBasalRate() {
+        return pump.currentBasal;
+    }
+
+    @Override
+    public void stopBolusDelivering() {
+        if (sExecutionService == null) {
+            log.error("stopBolusDelivering sExecutionService is null");
+            return;
+        }
+        sExecutionService.bolusStop();
+    }
+
+    @Override
+    public PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes, boolean enforceNew) {
+        PumpEnactResult result = new PumpEnactResult();
+        ConfigBuilderPlugin configBuilderPlugin = MainApp.getConfigBuilder();
+        percent = configBuilderPlugin.applyBasalConstraints(percent);
+        if (percent < 0) {
+            result.isTempCancel = false;
+            result.enacted = false;
+            result.success = false;
+            result.comment = MainApp.instance().getString(R.string.danar_invalidinput);
+            log.error("setTempBasalPercent: Invalid input");
+            return result;
+        }
+        if (percent > getPumpDescription().maxTempPercent)
+            percent = getPumpDescription().maxTempPercent;
+        TemporaryBasal runningTB =  MainApp.getConfigBuilder().getRealTempBasalFromHistory(System.currentTimeMillis());
+        if (runningTB != null && runningTB.percentRate == percent && !enforceNew) {
+            result.enacted = false;
+            result.success = true;
+            result.isTempCancel = false;
+            result.comment = MainApp.instance().getString(R.string.virtualpump_resultok);
+            result.duration = pump.tempBasalRemainingMin;
+            result.percent = pump.tempBasalPercent;
+            result.absolute = MainApp.getConfigBuilder().getTempBasalAbsoluteRateHistory();
+            result.isPercent = true;
+            if (Config.logPumpActions)
+                log.debug("setTempBasalPercent: Correct value already set");
+            return result;
+        }
+        int durationInHours = Math.max(durationInMinutes / 60, 1);
+        boolean connectionOK = sExecutionService.tempBasal(percent, durationInHours);
+        if (connectionOK && pump.isTempBasalInProgress && pump.tempBasalPercent == percent) {
+            result.enacted = true;
+            result.success = true;
+            result.comment = MainApp.instance().getString(R.string.virtualpump_resultok);
+            result.isTempCancel = false;
+            result.duration = pump.tempBasalRemainingMin;
+            result.percent = pump.tempBasalPercent;
+            result.absolute = MainApp.getConfigBuilder().getTempBasalAbsoluteRateHistory();
+            result.isPercent = true;
+            if (Config.logPumpActions)
+                log.debug("setTempBasalPercent: OK");
+            return result;
+        }
+        result.enacted = false;
+        result.success = false;
+        result.comment = MainApp.instance().getString(R.string.tempbasaldeliveryerror);
+        log.error("setTempBasalPercent: Failed to set temp basal");
+        return result;
+    }
+
+    @Override
+    public PumpEnactResult setExtendedBolus(Double insulin, Integer durationInMinutes) {
+        ConfigBuilderPlugin configBuilderPlugin = MainApp.getConfigBuilder();
+        insulin = configBuilderPlugin.applyBolusConstraints(insulin);
+        // needs to be rounded
+        int durationInHalfHours = Math.max(durationInMinutes / 30, 1);
+        insulin = Round.roundTo(insulin, getPumpDescription().extendedBolusStep);
+
+        PumpEnactResult result = new PumpEnactResult();
+        ExtendedBolus runningEB = MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis());
+        if (runningEB != null && Math.abs(runningEB.insulin - insulin) < getPumpDescription().extendedBolusStep) {
+            result.enacted = false;
+            result.success = true;
+            result.comment = MainApp.instance().getString(R.string.virtualpump_resultok);
+            result.duration = pump.extendedBolusRemainingMinutes;
+            result.absolute = pump.extendedBolusAbsoluteRate;
+            result.isPercent = false;
+            result.isTempCancel = false;
+            if (Config.logPumpActions)
+                log.debug("setExtendedBolus: Correct extended bolus already set. Current: " + pump.extendedBolusAmount + " Asked: " + insulin);
+            return result;
+        }
+        boolean connectionOK = sExecutionService.extendedBolus(insulin, durationInHalfHours);
+        if (connectionOK && pump.isExtendedInProgress && Math.abs(pump.extendedBolusAmount - insulin) < getPumpDescription().extendedBolusStep) {
+            result.enacted = true;
+            result.success = true;
+            result.comment = MainApp.instance().getString(R.string.virtualpump_resultok);
+            result.isTempCancel = false;
+            result.duration = pump.extendedBolusRemainingMinutes;
+            result.absolute = pump.extendedBolusAbsoluteRate;
+            result.bolusDelivered = pump.extendedBolusAmount;
+            result.isPercent = false;
+            if (Config.logPumpActions)
+                log.debug("setExtendedBolus: OK");
+            return result;
+        }
+        result.enacted = false;
+        result.success = false;
+        result.comment = MainApp.instance().getString(R.string.danar_valuenotsetproperly);
+        log.error("setExtendedBolus: Failed to extended bolus");
+        return result;
+    }
+
+    @Override
+    public PumpEnactResult cancelExtendedBolus() {
+        PumpEnactResult result = new PumpEnactResult();
+        ExtendedBolus runningEB = MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis());
+        if (runningEB != null) {
+            sExecutionService.extendedBolusStop();
+            result.enacted = true;
+            result.isTempCancel = true;
+        }
+        if (!pump.isExtendedInProgress) {
+            result.success = true;
+            result.comment = MainApp.instance().getString(R.string.virtualpump_resultok);
+            if (Config.logPumpActions)
+                log.debug("cancelExtendedBolus: OK");
+            return result;
+        } else {
+            result.success = false;
+            result.comment = MainApp.instance().getString(R.string.danar_valuenotsetproperly);
+            log.error("cancelExtendedBolus: Failed to cancel extended bolus");
+            return result;
+        }
+    }
+
+    @Override
+    public void connect(String from) {
+        if (sExecutionService != null) {
+            sExecutionService.connect();
+            pumpDescription.basalStep = pump.basalStep;
+            pumpDescription.bolusStep = pump.bolusStep;
+        }
+    }
+
+    @Override
+    public boolean isConnected() {
+        return sExecutionService != null && sExecutionService.isConnected();
+    }
+
+    @Override
+    public boolean isConnecting() {
+        return sExecutionService != null && sExecutionService.isConnecting();
+    }
+
+    @Override
+    public void disconnect(String from) {
+        if (sExecutionService != null) sExecutionService.disconnect(from);
+    }
+
+    @Override
+    public void stopConnecting() {
+        if (sExecutionService != null) sExecutionService.stopConnecting();
+    }
+
+    @Override
+    public void getPumpStatus() {
+        if (sExecutionService != null) sExecutionService.getPumpStatus();
+    }
+
+    @Override
+    public JSONObject getJSONStatus() {
+        if (pump.lastConnection + 5 * 60 * 1000L < System.currentTimeMillis()) {
+            return null;
+        }
+        JSONObject pumpjson = new JSONObject();
+        JSONObject battery = new JSONObject();
+        JSONObject status = new JSONObject();
+        JSONObject extended = new JSONObject();
+        try {
+            battery.put("percent", pump.batteryRemaining);
+            status.put("status", pump.pumpSuspended ? "suspended" : "normal");
+            status.put("timestamp", DateUtil.toISOString(pump.lastConnection));
+            extended.put("Version", BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION);
+            extended.put("PumpIOB", pump.iob);
+            if (pump.lastBolusTime.getTime() != 0) {
+                extended.put("LastBolus", pump.lastBolusTime.toLocaleString());
+                extended.put("LastBolusAmount", pump.lastBolusAmount);
+            }
+            TemporaryBasal tb = MainApp.getConfigBuilder().getRealTempBasalFromHistory(System.currentTimeMillis());
+            if (tb != null) {
+                extended.put("TempBasalAbsoluteRate", tb.tempBasalConvertedToAbsolute(System.currentTimeMillis()));
+                extended.put("TempBasalStart", DateUtil.dateAndTimeString(tb.date));
+                extended.put("TempBasalRemaining", tb.getPlannedRemainingMinutes());
+            }
+            ExtendedBolus eb = MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis());
+            if (eb != null) {
+                extended.put("ExtendedBolusAbsoluteRate", eb.absoluteRate());
+                extended.put("ExtendedBolusStart", DateUtil.dateAndTimeString(eb.date));
+                extended.put("ExtendedBolusRemaining", eb.getPlannedRemainingMinutes());
+            }
+            extended.put("BaseBasalRate", getBaseBasalRate());
+            try {
+                extended.put("ActiveProfile", MainApp.getConfigBuilder().getProfileName());
+            } catch (Exception e) {
+            }
+
+            pumpjson.put("battery", battery);
+            pumpjson.put("status", status);
+            pumpjson.put("extended", extended);
+            pumpjson.put("reservoir", (int) pump.reservoirRemainingUnits);
+            pumpjson.put("clock", DateUtil.toISOString(new Date()));
+        } catch (JSONException e) {
+            log.error("Unhandled exception", e);
+        }
+        return pumpjson;
+    }
+
+    @Override
+    public String deviceID() {
+        return pump.serialNumber;
+    }
+
+    @Override
+    public PumpDescription getPumpDescription() {
+        return pumpDescription;
+    }
+
+    /**
+     * DanaR interface
+     */
+
+    @Override
+    public PumpEnactResult loadHistory(byte type) {
+        return sExecutionService.loadHistory(type);
+    }
+
+    /**
+     * Constraint interface
+     */
+
+    @Override
+    public boolean isLoopEnabled() {
+        return true;
+    }
+
+    @Override
+    public boolean isClosedModeEnabled() {
+        return true;
+    }
+
+    @Override
+    public boolean isAutosensModeEnabled() {
+        return true;
+    }
+
+    @Override
+    public boolean isAMAModeEnabled() {
+        return true;
+    }
+
+    @Override
+    public boolean isSMBModeEnabled() {
+        return true;
+    }
+
+    @SuppressWarnings("PointlessBooleanExpression")
+    @Override
+    public Double applyBasalConstraints(Double absoluteRate) {
+        double origAbsoluteRate = absoluteRate;
+        if (pump != null) {
+            if (absoluteRate > pump.maxBasal) {
+                absoluteRate = pump.maxBasal;
+                if (Config.logConstraintsChanges && origAbsoluteRate != Constants.basalAbsoluteOnlyForCheckLimit)
+                    log.debug("Limiting rate " + origAbsoluteRate + "U/h by pump constraint to " + absoluteRate + "U/h");
+            }
+        }
+        return absoluteRate;
+    }
+
+    @SuppressWarnings("PointlessBooleanExpression")
+    @Override
+    public Integer applyBasalConstraints(Integer percentRate) {
+        Integer origPercentRate = percentRate;
+        if (percentRate < 0) percentRate = 0;
+        if (percentRate > getPumpDescription().maxTempPercent)
+            percentRate = getPumpDescription().maxTempPercent;
+        if (!Objects.equals(percentRate, origPercentRate) && Config.logConstraintsChanges && !Objects.equals(origPercentRate, Constants.basalPercentOnlyForCheckLimit))
+            log.debug("Limiting percent rate " + origPercentRate + "% to " + percentRate + "%");
+        return percentRate;
+    }
+
+    @SuppressWarnings("PointlessBooleanExpression")
+    @Override
+    public Double applyBolusConstraints(Double insulin) {
+        double origInsulin = insulin;
+        if (pump != null) {
+            if (insulin > pump.maxBolus) {
+                insulin = pump.maxBolus;
+                if (Config.logConstraintsChanges && origInsulin != Constants.bolusOnlyForCheckLimit)
+                    log.debug("Limiting bolus " + origInsulin + "U by pump constraint to " + insulin + "U");
+            }
+        }
+        return insulin;
+    }
+
+    @Override
+    public Integer applyCarbsConstraints(Integer carbs) {
+        return carbs;
+    }
+
+    @Override
+    public Double applyMaxIOBConstraints(Double maxIob) {
+        return maxIob;
+    }
+
+    @Nullable
+    @Override
+    public ProfileStore getProfile() {
+        if (pump.lastSettingsRead == 0)
+            return null; // no info now
+        return pump.createConvertedProfile();
+    }
+
+    @Override
+    public String getUnits() {
+        return pump.getUnits();
+    }
+
+    @Override
+    public String getProfileName() {
+        return pump.createConvertedProfileName();
+    }
+
+    // Reply for sms communicator
+    public String shortStatus(boolean veryShort) {
+        String ret = "";
+        if (pump.lastConnection != 0) {
+            Long agoMsec = System.currentTimeMillis() - pump.lastConnection;
+            int agoMin = (int) (agoMsec / 60d / 1000d);
+            ret += "LastConn: " + agoMin + " minago\n";
+        }
+        if (pump.lastBolusTime.getTime() != 0) {
+            ret += "LastBolus: " + DecimalFormatter.to2Decimal(pump.lastBolusAmount) + "U @" + android.text.format.DateFormat.format("HH:mm", pump.lastBolusTime) + "\n";
+        }
+        if (MainApp.getConfigBuilder().isInHistoryRealTempBasalInProgress()) {
+            ret += "Temp: " + MainApp.getConfigBuilder().getRealTempBasalFromHistory(System.currentTimeMillis()).toStringFull() + "\n";
+        }
+        if (MainApp.getConfigBuilder().isInHistoryExtendedBoluslInProgress()) {
+            ret += "Extended: " + MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis()).toString() + "\n";
+        }
+        if (!veryShort) {
+            ret += "TDD: " + DecimalFormatter.to0Decimal(pump.dailyTotalUnits) + " / " + pump.maxDailyTotalUnits + " U\n";
+        }
+        ret += "IOB: " + pump.iob + "U\n";
+        ret += "Reserv: " + DecimalFormatter.to0Decimal(pump.reservoirRemainingUnits) + "U\n";
+        ret += "Batt: " + pump.batteryRemaining + "\n";
+        return ret;
+    }
+    // TODO: daily total constraint
+
+}

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

@@ -6,6 +6,7 @@ import android.preference.ListPreference;
 import android.util.AttributeSet;
 
 import java.util.Set;
+import java.util.Vector;
 
 public class BluetoothDevicePreference extends ListPreference {
 
@@ -13,21 +14,18 @@ public class BluetoothDevicePreference extends ListPreference {
         super(context, attrs);
 
         BluetoothAdapter bta = BluetoothAdapter.getDefaultAdapter();
-        Integer size = 0;
+        Vector<CharSequence> entries = new Vector<CharSequence>();
-        if (bta != null) {
-            size += bta.getBondedDevices().size();
-        }
-        CharSequence[] entries = new CharSequence[size];
-        int i = 0;
         if (bta != null) {
             Set<BluetoothDevice> pairedDevices = bta.getBondedDevices();
             for (BluetoothDevice dev : pairedDevices) {
-                entries[i] = dev.getName();
+                String name = dev.getName();
-                i++;
+                if(name != null) {
+                    entries.add(name);
                 }
             }
-        setEntries(entries);
+        }
-        setEntryValues(entries);
+        setEntries(entries.toArray(new CharSequence[0]));
+        setEntryValues(entries.toArray(new CharSequence[0]));
     }
 
     public BluetoothDevicePreference(Context context) {

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

@@ -6,8 +6,8 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
-import android.os.HandlerThread;
 import android.support.v4.app.FragmentManager;
+import android.text.Spanned;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -21,16 +21,24 @@ import com.squareup.otto.Subscribe;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Date;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import butterknife.Unbinder;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.events.EventExtendedBolusChange;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
 import info.nightscout.androidaps.events.EventTempBasalChange;
 import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
+import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.PumpDanaR.Dialogs.ProfileViewDialog;
 import info.nightscout.androidaps.plugins.PumpDanaR.activities.DanaRHistoryActivity;
 import info.nightscout.androidaps.plugins.PumpDanaR.activities.DanaRStatsActivity;
 import info.nightscout.androidaps.plugins.PumpDanaR.events.EventDanaRNewStatus;
+import info.nightscout.androidaps.queue.events.EventQueueChanged;
 import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.DecimalFormatter;
 import info.nightscout.utils.SetWarnColor;
@@ -38,62 +46,47 @@ import info.nightscout.utils.SetWarnColor;
 public class DanaRFragment extends SubscriberFragment {
     private static Logger log = LoggerFactory.getLogger(DanaRFragment.class);
 
-    private static Handler sHandler;
-    private static HandlerThread sHandlerThread;
-
     private Handler loopHandler = new Handler();
-    private Runnable refreshLoop = null;
+    private Runnable refreshLoop = new Runnable() {
-
-    TextView lastConnectionView;
-    TextView btConnectionView;
-    TextView lastBolusView;
-    TextView dailyUnitsView;
-    TextView basaBasalRateView;
-    TextView tempBasalView;
-    TextView extendedBolusView;
-    TextView batteryView;
-    TextView reservoirView;
-    TextView iobView;
-    TextView firmwareView;
-    TextView basalStepView;
-    TextView bolusStepView;
-    TextView serialNumberView;
-    Button viewProfileButton;
-    Button historyButton;
-    Button statsButton;
-
-    LinearLayout pumpStatusLayout;
-    TextView pumpStatusView;
-
-    static Runnable connectRunnable = new Runnable() {
-        @Override
-        public void run() {
-            MainApp.getConfigBuilder().refreshDataFromPump("Connect request from GUI");
-        }
-    };
-
-
-    public DanaRFragment() {
-        if (sHandlerThread == null) {
-            sHandlerThread = new HandlerThread(DanaRFragment.class.getSimpleName());
-            sHandlerThread.start();
-            sHandler = new Handler(sHandlerThread.getLooper());
-        }
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (refreshLoop == null) {
-            refreshLoop = new Runnable() {
         @Override
         public void run() {
             updateGUI();
             loopHandler.postDelayed(refreshLoop, 60 * 1000L);
         }
     };
+
+    @BindView(R.id.danar_lastconnection) TextView lastConnectionView;
+    @BindView(R.id.danar_btconnection) TextView btConnectionView;
+    @BindView(R.id.danar_lastbolus) TextView lastBolusView;
+    @BindView(R.id.danar_dailyunits) TextView dailyUnitsView;
+    @BindView(R.id.danar_basabasalrate) TextView basaBasalRateView;
+    @BindView(R.id.danar_tempbasal) TextView tempBasalView;
+    @BindView(R.id.danar_extendedbolus) TextView extendedBolusView;
+    @BindView(R.id.danar_battery) TextView batteryView;
+    @BindView(R.id.danar_reservoir) TextView reservoirView;
+    @BindView(R.id.danar_iob) TextView iobView;
+    @BindView(R.id.danar_firmware) TextView firmwareView;
+    @BindView(R.id.danar_basalstep) TextView basalStepView;
+    @BindView(R.id.danar_bolusstep) TextView bolusStepView;
+    @BindView(R.id.danar_serialnumber) TextView serialNumberView;
+    @BindView(R.id.danar_queue) TextView queueView;
+
+    @BindView(R.id.overview_pumpstatuslayout) LinearLayout pumpStatusLayout;
+    @BindView(R.id.overview_pumpstatus) TextView pumpStatusView;
+
+    public DanaRFragment() {
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
         loopHandler.postDelayed(refreshLoop, 60 * 1000L);
     }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        loopHandler.removeCallbacks(refreshLoop);
     }
 
     @Override
@@ -101,60 +94,10 @@ public class DanaRFragment extends SubscriberFragment {
                              Bundle savedInstanceState) {
         try {
             View view = inflater.inflate(R.layout.danar_fragment, container, false);
-            btConnectionView = (TextView) view.findViewById(R.id.danar_btconnection);
+            unbinder = ButterKnife.bind(this, view);
-            lastConnectionView = (TextView) view.findViewById(R.id.danar_lastconnection);
-            lastBolusView = (TextView) view.findViewById(R.id.danar_lastbolus);
-            dailyUnitsView = (TextView) view.findViewById(R.id.danar_dailyunits);
-            basaBasalRateView = (TextView) view.findViewById(R.id.danar_basabasalrate);
-            tempBasalView = (TextView) view.findViewById(R.id.danar_tempbasal);
-            extendedBolusView = (TextView) view.findViewById(R.id.danar_extendedbolus);
-            batteryView = (TextView) view.findViewById(R.id.danar_battery);
-            reservoirView = (TextView) view.findViewById(R.id.danar_reservoir);
-            iobView = (TextView) view.findViewById(R.id.danar_iob);
-            firmwareView = (TextView) view.findViewById(R.id.danar_firmware);
-            viewProfileButton = (Button) view.findViewById(R.id.danar_viewprofile);
-            historyButton = (Button) view.findViewById(R.id.danar_history);
-            statsButton = (Button) view.findViewById(R.id.danar_stats);
-            basalStepView = (TextView) view.findViewById(R.id.danar_basalstep);
-            bolusStepView = (TextView) view.findViewById(R.id.danar_bolusstep);
-            serialNumberView = (TextView) view.findViewById(R.id.danar_serialnumber);
 
-            pumpStatusView = (TextView) view.findViewById(R.id.overview_pumpstatus);
             pumpStatusView.setBackgroundColor(MainApp.sResources.getColor(R.color.colorInitializingBorder));
-            pumpStatusLayout = (LinearLayout) view.findViewById(R.id.overview_pumpstatuslayout);
 
-            viewProfileButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    FragmentManager manager = getFragmentManager();
-                    ProfileViewDialog profileViewDialog = new ProfileViewDialog();
-                    profileViewDialog.show(manager, "ProfileViewDialog");
-                }
-            });
-
-            historyButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    startActivity(new Intent(getContext(), DanaRHistoryActivity.class));
-                }
-            });
-
-            statsButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    startActivity(new Intent(getContext(), DanaRStatsActivity.class));
-                }
-            });
-
-            btConnectionView.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    log.debug("Clicked connect to pump");
-                    sHandler.post(connectRunnable);
-                }
-            });
-
-            updateGUI();
             return view;
         } catch (Exception e) {
             Crashlytics.logException(e);
@@ -163,6 +106,26 @@ public class DanaRFragment extends SubscriberFragment {
         return null;
     }
 
+    @OnClick(R.id.danar_history) void onHistoryClick() {
+        startActivity(new Intent(getContext(), DanaRHistoryActivity.class));
+    }
+
+    @OnClick(R.id.danar_viewprofile) void onViewProfileClick() {
+        FragmentManager manager = getFragmentManager();
+        ProfileViewDialog profileViewDialog = new ProfileViewDialog();
+        profileViewDialog.show(manager, "ProfileViewDialog");
+    }
+
+    @OnClick(R.id.danar_stats) void onStatsClick() {
+        startActivity(new Intent(getContext(), DanaRStatsActivity.class));
+    }
+
+    @OnClick(R.id.danar_btconnection) void onBtConnectionClick() {
+        log.debug("Clicked connect to pump");
+        DanaRPump.getInstance().lastConnection = 0;
+        ConfigBuilderPlugin.getCommandQueue().readStatus("Clicked connect to pump", null);
+    }
+
     @Subscribe
     public void onStatusEvent(final EventPumpStatusChanged c) {
         Activity activity = getActivity();
@@ -206,6 +169,11 @@ public class DanaRFragment extends SubscriberFragment {
         updateGUI();
     }
 
+    @Subscribe
+    public void onStatusEvent(final EventQueueChanged s) {
+        updateGUI();
+    }
+
     // GUI functions
     @Override
     protected void updateGUI() {
@@ -216,8 +184,8 @@ public class DanaRFragment extends SubscriberFragment {
                 @Override
                 public void run() {
                     DanaRPump pump = DanaRPump.getInstance();
-                    if (pump.lastConnection.getTime() != 0) {
+                    if (pump.lastConnection != 0) {
-                        Long agoMsec = System.currentTimeMillis() - pump.lastConnection.getTime();
+                        Long agoMsec = System.currentTimeMillis() - pump.lastConnection;
                         int agoMin = (int) (agoMsec / 60d / 1000d);
                         lastConnectionView.setText(DateUtil.timeString(pump.lastConnection) + " (" + String.format(MainApp.sResources.getString(R.string.minago), agoMin) + ")");
                         SetWarnColor.setColor(lastConnectionView, agoMin, 16d, 31d);
@@ -232,9 +200,9 @@ public class DanaRFragment extends SubscriberFragment {
 
                     dailyUnitsView.setText(DecimalFormatter.to0Decimal(pump.dailyTotalUnits) + " / " + pump.maxDailyTotalUnits + " U");
                     SetWarnColor.setColor(dailyUnitsView, pump.dailyTotalUnits, pump.maxDailyTotalUnits * 0.75d, pump.maxDailyTotalUnits * 0.9d);
-                    basaBasalRateView.setText("( " + (pump.activeProfile + 1) + " )  " + DecimalFormatter.to2Decimal(MainApp.getConfigBuilder().getBaseBasalRate()) + " U/h");
+                    basaBasalRateView.setText("( " + (pump.activeProfile + 1) + " )  " + DecimalFormatter.to2Decimal(ConfigBuilderPlugin.getActivePump().getBaseBasalRate()) + " U/h");
                     // DanaRPlugin, DanaRKoreanPlugin
-                    if (MainApp.getConfigBuilder().isFakingTempsByExtendedBoluses()) {
+                    if (ConfigBuilderPlugin.getActivePump().isFakingTempsByExtendedBoluses()) {
                         if (MainApp.getConfigBuilder().isInHistoryRealTempBasalInProgress()) {
                             tempBasalView.setText(MainApp.getConfigBuilder().getRealTempBasalFromHistory(System.currentTimeMillis()).toStringFull());
                         } else {
@@ -266,10 +234,17 @@ public class DanaRFragment extends SubscriberFragment {
                     basalStepView.setText("" + pump.basalStep);
                     bolusStepView.setText("" + pump.bolusStep);
                     serialNumberView.setText("" + pump.serialNumber);
-
+                    if (queueView != null) {
+                        Spanned status = ConfigBuilderPlugin.getCommandQueue().spannedStatus();
+                        if (status.toString().equals("")) {
+                            queueView.setVisibility(View.GONE);
+                        } else {
+                            queueView.setVisibility(View.VISIBLE);
+                            queueView.setText(status);
+                        }
+                    }
                 }
             });
-
     }
 
 }

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

@@ -5,69 +5,30 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.IBinder;
-import android.support.annotation.Nullable;
 
 import com.squareup.otto.Subscribe;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Date;
-import java.util.Objects;
-
-import info.nightscout.androidaps.BuildConfig;
 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.DetailedBolusInfo;
 import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.db.ExtendedBolus;
 import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.events.EventAppExit;
 import info.nightscout.androidaps.events.EventPreferenceChange;
-import info.nightscout.androidaps.interfaces.ConstraintsInterface;
-import info.nightscout.androidaps.interfaces.DanaRInterface;
-import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.ProfileInterface;
 import info.nightscout.androidaps.interfaces.PumpDescription;
-import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.data.ProfileStore;
-import info.nightscout.androidaps.plugins.Overview.Notification;
-import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
-import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
-import info.nightscout.androidaps.plugins.ProfileNS.NSProfilePlugin;
 import info.nightscout.androidaps.plugins.PumpDanaR.services.DanaRExecutionService;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DecimalFormatter;
 import info.nightscout.utils.Round;
 import info.nightscout.utils.SP;
 
 /**
  * Created by mike on 05.08.2016.
  */
-public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, ConstraintsInterface, ProfileInterface {
+public class DanaRPlugin extends AbstractDanaRPlugin {
-    private static Logger log = LoggerFactory.getLogger(DanaRPlugin.class);
-
-    @Override
-    public String getFragmentClass() {
-        return DanaRFragment.class.getName();
-    }
-
-    private static boolean fragmentPumpEnabled = false;
-    private static boolean fragmentProfileEnabled = false;
-    private static boolean fragmentPumpVisible = true;
-
-    private static DanaRExecutionService sExecutionService;
-
-
-    private static DanaRPump pump = DanaRPump.getInstance();
-    private static boolean useExtendedBoluses = false;
 
     private static DanaRPlugin plugin = null;
 
@@ -77,9 +38,8 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C
         return plugin;
     }
 
-    public static PumpDescription pumpDescription = new PumpDescription();
-
     public DanaRPlugin() {
+        log = LoggerFactory.getLogger(DanaRPlugin.class);
         useExtendedBoluses = SP.getBoolean("danar_useextended", false);
 
         Context context = MainApp.instance().getApplicationContext();
@@ -110,6 +70,8 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C
         pumpDescription.basalMinimumRate = 0.04d;
 
         pumpDescription.isRefillingCapable = true;
+
+        pumpDescription.storesCarbInfo = true;
     }
 
     private ServiceConnection mConnection = new ServiceConnection() {
@@ -145,83 +107,17 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C
     }
 
     // Plugin base interface
-    @Override
-    public int getType() {
-        return PluginBase.PUMP;
-    }
-
     @Override
     public String getName() {
         return MainApp.instance().getString(R.string.danarpump);
     }
 
-    @Override
-    public String getNameShort() {
-        String name = MainApp.sResources.getString(R.string.danarpump_shortname);
-        if (!name.trim().isEmpty()) {
-            //only if translation exists
-            return name;
-        }
-        // use long name as fallback
-        return getName();
-    }
-
-    @Override
-    public boolean isEnabled(int type) {
-        if (type == PluginBase.PROFILE) return fragmentProfileEnabled && fragmentPumpEnabled;
-        else if (type == PluginBase.PUMP) return fragmentPumpEnabled;
-        else if (type == PluginBase.CONSTRAINTS) return fragmentPumpEnabled;
-        return false;
-    }
-
-    @Override
-    public boolean isVisibleInTabs(int type) {
-        if (type == PluginBase.PROFILE || type == PluginBase.CONSTRAINTS) return false;
-        else if (type == PluginBase.PUMP) return fragmentPumpVisible;
-        return false;
-    }
-
-    @Override
-    public boolean canBeHidden(int type) {
-        return true;
-    }
-
-    @Override
-    public boolean hasFragment() {
-        return true;
-    }
-
-    @Override
-    public boolean showInList(int type) {
-        return type == PUMP;
-    }
-
-    @Override
-    public void setFragmentEnabled(int type, boolean fragmentEnabled) {
-        if (type == PluginBase.PROFILE)
-            fragmentProfileEnabled = fragmentEnabled;
-        else if (type == PluginBase.PUMP)
-            fragmentPumpEnabled = fragmentEnabled;
-        // if pump profile was enabled need to switch to another too
-        if (type == PluginBase.PUMP && !fragmentEnabled && fragmentProfileEnabled) {
-            setFragmentEnabled(PluginBase.PROFILE, false);
-            setFragmentVisible(PluginBase.PROFILE, false);
-            NSProfilePlugin.getPlugin().setFragmentEnabled(PluginBase.PROFILE, true);
-            NSProfilePlugin.getPlugin().setFragmentVisible(PluginBase.PROFILE, true);
-        }
-    }
-
-    @Override
-    public void setFragmentVisible(int type, boolean fragmentVisible) {
-        if (type == PluginBase.PUMP)
-            fragmentPumpVisible = fragmentVisible;
-    }
-
     @Override
     public int getPreferencesId() {
         return R.xml.pref_danar;
     }
 
+    // Pump interface
     @Override
     public boolean isFakingTempsByExtendedBoluses() {
         return useExtendedBoluses;
@@ -229,81 +125,7 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C
 
     @Override
     public boolean isInitialized() {
-        return pump.lastConnection.getTime() > 0 && pump.isExtendedBolusEnabled;
+        return pump.lastConnection > 0 && pump.isExtendedBolusEnabled && pump.maxBasal > 0;
-    }
-
-    @Override
-    public boolean isSuspended() {
-        return pump.pumpSuspended;
-    }
-
-    @Override
-    public boolean isBusy() {
-        if (sExecutionService == null) return false;
-        return sExecutionService.isConnected() || sExecutionService.isConnecting();
-    }
-
-    // Pump interface
-    @Override
-    public int setNewBasalProfile(Profile profile) {
-        if (sExecutionService == null) {
-            log.error("setNewBasalProfile sExecutionService is null");
-            return FAILED;
-        }
-        if (!isInitialized()) {
-            log.error("setNewBasalProfile not initialized");
-            Notification notification = new Notification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, MainApp.sResources.getString(R.string.pumpNotInitializedProfileNotSet), Notification.URGENT);
-            MainApp.bus().post(new EventNewNotification(notification));
-            return FAILED;
-        } else {
-            MainApp.bus().post(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED));
-        }
-        if (!sExecutionService.updateBasalsInPump(profile)) {
-            Notification notification = new Notification(Notification.FAILED_UDPATE_PROFILE, MainApp.sResources.getString(R.string.failedupdatebasalprofile), Notification.URGENT);
-            MainApp.bus().post(new EventNewNotification(notification));
-            return FAILED;
-        } else {
-            MainApp.bus().post(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED));
-            MainApp.bus().post(new EventDismissNotification(Notification.FAILED_UDPATE_PROFILE));
-            return SUCCESS;
-        }
-    }
-
-    @Override
-    public boolean isThisProfileSet(Profile profile) {
-        if (!isInitialized())
-            return true; // TODO: not sure what's better. so far TRUE to prevent too many SMS
-        if (pump.pumpProfiles == null)
-            return true; // TODO: not sure what's better. so far TRUE to prevent too many SMS
-        int basalValues = pump.basal48Enable ? 48 : 24;
-        int basalIncrement = pump.basal48Enable ? 30 * 60 : 60 * 60;
-        for (int h = 0; h < basalValues; h++) {
-            Double pumpValue = pump.pumpProfiles[pump.activeProfile][h];
-            Double profileValue = profile.getBasal((Integer) (h * basalIncrement));
-            if (profileValue == null) return true;
-            if (Math.abs(pumpValue - profileValue) > getPumpDescription().basalStep) {
-                log.debug("Diff found. Hour: " + h + " Pump: " + pumpValue + " Profile: " + profileValue);
-                return false;
-            }
-        }
-        return true;
-    }
-
-    @Override
-    public Date lastDataTime() {
-        return pump.lastConnection;
-    }
-
-    @Override
-    public void refreshDataFromPump(String reason) {
-        if (!isConnected() && !isConnecting()) {
-            doConnect(reason);
-        }
-    }
-
-    @Override
-    public double getBaseBasalRate() {
-        return pump.currentBasal;
     }
 
     @Override
@@ -313,7 +135,7 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C
         if (detailedBolusInfo.insulin > 0 || detailedBolusInfo.carbs > 0) {
             Treatment t = new Treatment();
             boolean connectionOK = false;
-            if (detailedBolusInfo.insulin > 0 || detailedBolusInfo.carbs > 0) connectionOK = sExecutionService.bolus(detailedBolusInfo.insulin, (int) detailedBolusInfo.carbs, t);
+            if (detailedBolusInfo.insulin > 0 || detailedBolusInfo.carbs > 0) connectionOK = sExecutionService.bolus(detailedBolusInfo.insulin, (int) detailedBolusInfo.carbs, detailedBolusInfo.carbTime, t);
             PumpEnactResult result = new PumpEnactResult();
             result.success = connectionOK;
             result.bolusDelivered = t.insulin;
@@ -336,22 +158,14 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C
         }
     }
 
-    @Override
-    public void stopBolusDelivering() {
-        if (sExecutionService == null) {
-            log.error("stopBolusDelivering sExecutionService is null");
-            return;
-        }
-        sExecutionService.bolusStop();
-    }
-
     // This is called from APS
     @Override
     public PumpEnactResult setTempBasalAbsolute(Double absoluteRate, Integer durationInMinutes, boolean enforceNew) {
         // Recheck pump status if older than 30 min
-        if (pump.lastConnection.getTime() + 30 * 60 * 1000L < System.currentTimeMillis()) {
+        //This should not be needed while using queue because connection should be done before calling this
-            doConnect("setTempBasalAbsolute old data");
+        //if (pump.lastConnection.getTime() + 30 * 60 * 1000L < System.currentTimeMillis()) {
-        }
+        //    connect("setTempBasalAbsolute old data");
+        //}
 
         PumpEnactResult result = new PumpEnactResult();
 
@@ -432,7 +246,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
@@ -496,100 +310,6 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C
         return result;
     }
 
-    @Override
-    public PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes) {
-        PumpEnactResult result = new PumpEnactResult();
-        ConfigBuilderPlugin configBuilderPlugin = MainApp.getConfigBuilder();
-        percent = configBuilderPlugin.applyBasalConstraints(percent);
-        if (percent < 0) {
-            result.isTempCancel = false;
-            result.enacted = false;
-            result.success = false;
-            result.comment = MainApp.instance().getString(R.string.danar_invalidinput);
-            log.error("setTempBasalPercent: Invalid input");
-            return result;
-        }
-        if (percent > getPumpDescription().maxTempPercent)
-            percent = getPumpDescription().maxTempPercent;
-        TemporaryBasal runningTB =  MainApp.getConfigBuilder().getRealTempBasalFromHistory(System.currentTimeMillis());
-        if (runningTB != null && runningTB.percentRate == percent) {
-            result.enacted = false;
-            result.success = true;
-            result.isTempCancel = false;
-            result.comment = MainApp.instance().getString(R.string.virtualpump_resultok);
-            result.duration = pump.tempBasalRemainingMin;
-            result.percent = pump.tempBasalPercent;
-            result.absolute = MainApp.getConfigBuilder().getTempBasalAbsoluteRateHistory();
-            result.isPercent = true;
-            if (Config.logPumpActions)
-                log.debug("setTempBasalPercent: Correct value already set");
-            return result;
-        }
-        int durationInHours = Math.max(durationInMinutes / 60, 1);
-        boolean connectionOK = sExecutionService.tempBasal(percent, durationInHours);
-        if (connectionOK && pump.isTempBasalInProgress && pump.tempBasalPercent == percent) {
-            result.enacted = true;
-            result.success = true;
-            result.comment = MainApp.instance().getString(R.string.virtualpump_resultok);
-            result.isTempCancel = false;
-            result.duration = pump.tempBasalRemainingMin;
-            result.percent = pump.tempBasalPercent;
-            result.absolute = MainApp.getConfigBuilder().getTempBasalAbsoluteRateHistory();
-            result.isPercent = true;
-            if (Config.logPumpActions)
-                log.debug("setTempBasalPercent: OK");
-            return result;
-        }
-        result.enacted = false;
-        result.success = false;
-        result.comment = MainApp.instance().getString(R.string.danar_valuenotsetproperly);
-        log.error("setTempBasalPercent: Failed to set temp basal");
-        return result;
-    }
-
-    @Override
-    public PumpEnactResult setExtendedBolus(Double insulin, Integer durationInMinutes) {
-        ConfigBuilderPlugin configBuilderPlugin = MainApp.getConfigBuilder();
-        insulin = configBuilderPlugin.applyBolusConstraints(insulin);
-        // needs to be rounded
-        int durationInHalfHours = Math.max(durationInMinutes / 30, 1);
-        insulin = Round.roundTo(insulin, getPumpDescription().extendedBolusStep);
-
-        PumpEnactResult result = new PumpEnactResult();
-        ExtendedBolus runningEB = MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis());
-        if (runningEB != null && Math.abs(runningEB.insulin - insulin) < getPumpDescription().extendedBolusStep) {
-            result.enacted = false;
-            result.success = true;
-            result.comment = MainApp.instance().getString(R.string.virtualpump_resultok);
-            result.duration = pump.extendedBolusRemainingMinutes;
-            result.absolute = pump.extendedBolusAbsoluteRate;
-            result.isPercent = false;
-            result.isTempCancel = false;
-            if (Config.logPumpActions)
-                log.debug("setExtendedBolus: Correct extended bolus already set. Current: " + pump.extendedBolusAmount + " Asked: " + insulin);
-            return result;
-        }
-        boolean connectionOK = sExecutionService.extendedBolus(insulin, durationInHalfHours);
-        if (connectionOK && pump.isExtendedInProgress && Math.abs(pump.extendedBolusAmount - insulin) < getPumpDescription().extendedBolusStep) {
-            result.enacted = true;
-            result.success = true;
-            result.comment = MainApp.instance().getString(R.string.virtualpump_resultok);
-            result.isTempCancel = false;
-            result.duration = pump.extendedBolusRemainingMinutes;
-            result.absolute = pump.extendedBolusAbsoluteRate;
-            result.bolusDelivered = pump.extendedBolusAmount;
-            result.isPercent = false;
-            if (Config.logPumpActions)
-                log.debug("setExtendedBolus: OK");
-            return result;
-        }
-        result.enacted = false;
-        result.success = false;
-        result.comment = MainApp.instance().getString(R.string.danar_valuenotsetproperly);
-        log.error("setExtendedBolus: Failed to extended bolus");
-        return result;
-    }
-
     @Override
     public PumpEnactResult cancelTempBasal(boolean force) {
         if (MainApp.getConfigBuilder().isInHistoryRealTempBasalInProgress())
@@ -631,232 +351,7 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C
     }
 
     @Override
-    public PumpEnactResult cancelExtendedBolus() {
+    public PumpEnactResult loadEvents() {
-        PumpEnactResult result = new PumpEnactResult();
+        return null; // no history, not needed
-        ExtendedBolus runningEB = MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis());
-        if (runningEB != null) {
-            sExecutionService.extendedBolusStop();
-            result.enacted = true;
-            result.isTempCancel = true;
-        }
-        if (!pump.isExtendedInProgress) {
-            result.success = true;
-            result.comment = MainApp.instance().getString(R.string.virtualpump_resultok);
-            if (Config.logPumpActions)
-                log.debug("cancelExtendedBolus: OK");
-            return result;
-        } else {
-            result.success = false;
-            result.comment = MainApp.instance().getString(R.string.danar_valuenotsetproperly);
-            log.error("cancelExtendedBolus: Failed to cancel extended bolus");
-            return result;
     }
 }
-
-    public static void doConnect(String from) {
-        if (sExecutionService != null) {
-            sExecutionService.connect(from);
-            pumpDescription.basalStep = pump.basalStep;
-            pumpDescription.bolusStep = pump.bolusStep;
-        }
-    }
-
-    public static boolean isConnected() {
-        return sExecutionService != null && sExecutionService.isConnected();
-    }
-
-    public static boolean isConnecting() {
-        return sExecutionService != null && sExecutionService.isConnecting();
-    }
-
-    public static void doDisconnect(String from) {
-        if (sExecutionService != null) sExecutionService.disconnect(from);
-    }
-
-    @Override
-    public JSONObject getJSONStatus() {
-        if (pump.lastConnection.getTime() + 5 * 60 * 1000L < System.currentTimeMillis()) {
-            return null;
-        }
-        JSONObject pumpjson = new JSONObject();
-        JSONObject battery = new JSONObject();
-        JSONObject status = new JSONObject();
-        JSONObject extended = new JSONObject();
-        try {
-            battery.put("percent", pump.batteryRemaining);
-            status.put("status", pump.pumpSuspended ? "suspended" : "normal");
-            status.put("timestamp", DateUtil.toISOString(pump.lastConnection));
-            extended.put("Version", BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION);
-            extended.put("PumpIOB", pump.iob);
-            if (pump.lastBolusTime.getTime() != 0) {
-                extended.put("LastBolus", pump.lastBolusTime.toLocaleString());
-                extended.put("LastBolusAmount", pump.lastBolusAmount);
-            }
-            TemporaryBasal tb = MainApp.getConfigBuilder().getRealTempBasalFromHistory(System.currentTimeMillis());
-            if (tb != null) {
-                extended.put("TempBasalAbsoluteRate", tb.tempBasalConvertedToAbsolute(System.currentTimeMillis()));
-                extended.put("TempBasalStart", DateUtil.dateAndTimeString(tb.date));
-                extended.put("TempBasalRemaining", tb.getPlannedRemainingMinutes());
-            }
-            ExtendedBolus eb = MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis());
-            if (eb != null) {
-                extended.put("ExtendedBolusAbsoluteRate", eb.absoluteRate());
-                extended.put("ExtendedBolusStart", DateUtil.dateAndTimeString(eb.date));
-                extended.put("ExtendedBolusRemaining", eb.getPlannedRemainingMinutes());
-            }
-            extended.put("BaseBasalRate", getBaseBasalRate());
-            try {
-                extended.put("ActiveProfile", MainApp.getConfigBuilder().getProfileName());
-            } catch (Exception e) {
-            }
-
-            pumpjson.put("battery", battery);
-            pumpjson.put("status", status);
-            pumpjson.put("extended", extended);
-            pumpjson.put("reservoir", (int) pump.reservoirRemainingUnits);
-            pumpjson.put("clock", DateUtil.toISOString(new Date()));
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return pumpjson;
-    }
-
-    @Override
-    public String deviceID() {
-        return pump.serialNumber;
-    }
-
-    @Override
-    public PumpDescription getPumpDescription() {
-        return pumpDescription;
-    }
-
-    /**
-     * DanaR interface
-     */
-
-    @Override
-    public boolean loadHistory(byte type) {
-        return sExecutionService.loadHistory(type);
-    }
-
-    /**
-     * Constraint interface
-     */
-
-    @Override
-    public boolean isLoopEnabled() {
-        return true;
-    }
-
-    @Override
-    public boolean isClosedModeEnabled() {
-        return true;
-    }
-
-    @Override
-    public boolean isAutosensModeEnabled() {
-        return true;
-    }
-
-    @Override
-    public boolean isAMAModeEnabled() {
-        return true;
-    }
-
-    @SuppressWarnings("PointlessBooleanExpression")
-    @Override
-    public Double applyBasalConstraints(Double absoluteRate) {
-        double origAbsoluteRate = absoluteRate;
-        if (pump != null) {
-            if (absoluteRate > pump.maxBasal) {
-                absoluteRate = pump.maxBasal;
-                if (Config.logConstraintsChanges && origAbsoluteRate != Constants.basalAbsoluteOnlyForCheckLimit)
-                    log.debug("Limiting rate " + origAbsoluteRate + "U/h by pump constraint to " + absoluteRate + "U/h");
-            }
-        }
-        return absoluteRate;
-    }
-
-    @SuppressWarnings("PointlessBooleanExpression")
-    @Override
-    public Integer applyBasalConstraints(Integer percentRate) {
-        Integer origPercentRate = percentRate;
-        if (percentRate < 0) percentRate = 0;
-        if (percentRate > getPumpDescription().maxTempPercent)
-            percentRate = getPumpDescription().maxTempPercent;
-        if (!Objects.equals(percentRate, origPercentRate) && Config.logConstraintsChanges && !Objects.equals(origPercentRate, Constants.basalPercentOnlyForCheckLimit))
-            log.debug("Limiting percent rate " + origPercentRate + "% to " + percentRate + "%");
-        return percentRate;
-    }
-
-    @SuppressWarnings("PointlessBooleanExpression")
-    @Override
-    public Double applyBolusConstraints(Double insulin) {
-        double origInsulin = insulin;
-        if (pump != null) {
-            if (insulin > pump.maxBolus) {
-                insulin = pump.maxBolus;
-                if (Config.logConstraintsChanges && origInsulin != Constants.bolusOnlyForCheckLimit)
-                    log.debug("Limiting bolus " + origInsulin + "U by pump constraint to " + insulin + "U");
-            }
-        }
-        return insulin;
-    }
-
-    @Override
-    public Integer applyCarbsConstraints(Integer carbs) {
-        return carbs;
-    }
-
-    @Override
-    public Double applyMaxIOBConstraints(Double maxIob) {
-        return maxIob;
-    }
-
-    @Nullable
-    @Override
-    public ProfileStore getProfile() {
-        if (pump.lastSettingsRead.getTime() == 0)
-            return null; // no info now
-        return pump.createConvertedProfile();
-    }
-
-    @Override
-    public String getUnits() {
-        return pump.getUnits();
-    }
-
-    @Override
-    public String getProfileName() {
-        return pump.createConvertedProfileName();
-    }
-
-    // Reply for sms communicator
-    public String shortStatus(boolean veryShort) {
-        String ret = "";
-        if (pump.lastConnection.getTime() != 0) {
-            Long agoMsec = System.currentTimeMillis() - pump.lastConnection.getTime();
-            int agoMin = (int) (agoMsec / 60d / 1000d);
-            ret += "LastConn: " + agoMin + " minago\n";
-        }
-        if (pump.lastBolusTime.getTime() != 0) {
-            ret += "LastBolus: " + DecimalFormatter.to2Decimal(pump.lastBolusAmount) + "U @" + android.text.format.DateFormat.format("HH:mm", pump.lastBolusTime) + "\n";
-        }
-        if (MainApp.getConfigBuilder().isInHistoryRealTempBasalInProgress()) {
-            ret += "Temp: " + MainApp.getConfigBuilder().getRealTempBasalFromHistory(System.currentTimeMillis()).toStringFull() + "\n";
-        }
-        if (MainApp.getConfigBuilder().isInHistoryExtendedBoluslInProgress()) {
-            ret += "Extended: " + MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis()).toString() + "\n";
-        }
-        if (!veryShort) {
-            ret += "TDD: " + DecimalFormatter.to0Decimal(pump.dailyTotalUnits) + " / " + pump.maxDailyTotalUnits + " U\n";
-        }
-        ret += "IOB: " + pump.iob + "U\n";
-        ret += "Reserv: " + DecimalFormatter.to0Decimal(pump.reservoirRemainingUnits) + "U\n";
-        ret += "Batt: " + pump.batteryRemaining + "\n";
-        return ret;
-    }
-    // TODO: daily total constraint
-
-}

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

@@ -56,8 +56,8 @@ public class DanaRPump {
     public static final int CARBS = 14;
     public static final int PRIMECANNULA = 15;
 
-    public Date lastConnection = new Date(0);
+    public long lastConnection = 0;
-    public Date lastSettingsRead = new Date(0);
+    public long lastSettingsRead =0;
 
     // Info
     public String serialNumber = "";

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

@@ -21,6 +21,7 @@ import info.nightscout.androidaps.data.ProfileStore;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.interfaces.ProfileInterface;
+import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
 import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
 import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPlugin;
@@ -44,14 +45,7 @@ public class ProfileViewDialog extends DialogFragment {
 
     private  Button refreshButton;
 
-    Handler mHandler;
-    static HandlerThread mHandlerThread;
-
     public ProfileViewDialog() {
-        mHandlerThread = new HandlerThread(ProfileViewDialog.class.getSimpleName());
-        mHandlerThread.start();
-
-        mHandler = new Handler(mHandlerThread.getLooper());
     }
 
     @Override
@@ -72,18 +66,7 @@ public class ProfileViewDialog extends DialogFragment {
         refreshButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                mHandler.post(new Runnable() {
+                ConfigBuilderPlugin.getCommandQueue().readStatus("ProfileViewDialog", null);
-                    @Override
-                    public void run() {
-                        DanaRPump.getInstance().lastSettingsRead = new Date(0);
-                        if (MainApp.getSpecificPlugin(DanaRPlugin.class).isEnabled(PluginBase.PUMP))
-                            DanaRPlugin.doConnect("ProfileViewDialog");
-                        if (MainApp.getSpecificPlugin(DanaRKoreanPlugin.class).isEnabled(PluginBase.PUMP))
-                            DanaRKoreanPlugin.doConnect("ProfileViewDialog");
-                        if (MainApp.getSpecificPlugin(DanaRv2Plugin.class).isEnabled(PluginBase.PUMP))
-                            DanaRv2Plugin.doConnect("ProfileViewDialog");
-                    }
-                });
                 dismiss();
             }
         });

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

@@ -9,36 +9,30 @@ import org.slf4j.LoggerFactory;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
 
 import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageHashTable;
+import info.nightscout.androidaps.plugins.PumpDanaR.services.AbstractSerialIOThread;
 import info.nightscout.utils.CRC;
 
 /**
  * Created by mike on 17.07.2016.
  */
-public class SerialIOThread extends Thread {
+public class SerialIOThread extends AbstractSerialIOThread {
     private static Logger log = LoggerFactory.getLogger(SerialIOThread.class);
 
     private InputStream mInputStream = null;
     private OutputStream mOutputStream = null;
     private BluetoothSocket mRfCommSocket;
 
-    private static final ScheduledExecutorService worker = Executors.newSingleThreadScheduledExecutor();
-    private static ScheduledFuture<?> scheduledDisconnection = null;
-
     private boolean mKeepRunning = true;
     private byte[] mReadBuff = new byte[0];
 
-    MessageBase processedMessage;
+    private MessageBase processedMessage;
 
     public SerialIOThread(BluetoothSocket rfcommSocket) {
-        super(SerialIOThread.class.toString());
+        super();
 
         mRfCommSocket = rfcommSocket;
         try {
@@ -64,7 +58,8 @@ public class SerialIOThread extends Thread {
                 // process all messages we already got
                 while (mReadBuff.length > 3) { // 3rd byte is packet size. continue only if we an determine packet size
                     byte[] extractedBuff = cutMessageFromBuffer();
-                    if (extractedBuff == null) break; // message is not complete in buffer (wrong packet calls disconnection)
+                    if (extractedBuff == null)
+                        break; // message is not complete in buffer (wrong packet calls disconnection)
 
                     int command = (extractedBuff[5] & 0xFF) | ((extractedBuff[4] << 8) & 0xFF00);
 
@@ -85,7 +80,6 @@ public class SerialIOThread extends Thread {
                     synchronized (message) {
                         message.notify();
                     }
-                    scheduleDisconnection();
                 }
             }
         } catch (Exception e) {
@@ -144,6 +138,7 @@ public class SerialIOThread extends Thread {
         }
     }
 
+    @Override
     public synchronized void sendMessage(MessageBase message) {
         if (!mRfCommSocket.isConnected()) {
             log.error("Socket not connected on sendMessage");
@@ -177,25 +172,9 @@ public class SerialIOThread extends Thread {
                 log.debug("Old firmware detected");
             }
         }
-        scheduleDisconnection();
-    }
-
-    public void scheduleDisconnection() {
-        class DisconnectRunnable implements Runnable {
-            public void run() {
-                disconnect("scheduleDisconnection");
-                scheduledDisconnection = null;
-            }
-        }
-        // prepare task for execution in 10 sec
-        // cancel waiting task to prevent sending multiple disconnections
-        if (scheduledDisconnection != null)
-            scheduledDisconnection.cancel(false);
-        Runnable task = new DisconnectRunnable();
-        final int sec = 10;
-        scheduledDisconnection = worker.schedule(task, sec, TimeUnit.SECONDS);
     }
 
+    @Override
     public void disconnect(String reason) {
         mKeepRunning = false;
         try {