Merge branch 'dev' into automation

.travis.yml

@@ -2,19 +2,19 @@ language: android
 jdk: oraclejdk8
 env:
   matrix:
-    - ANDROID_TARGET=android-23 ANDROID_ABI=x86 org.gradle.jvmargs=-XX:-OmitStackTraceInFastThrow
+    - ANDROID_TARGET=android-28 ANDROID_ABI=x86 org.gradle.jvmargs=-XX:-OmitStackTraceInFastThrow
 android:
   components:
   - platform-tools
   - tools
-  - build-tools-27.0.2
+  - build-tools-28.0.3
-  - android-23
+  - android-28
   - extra-google-m2repository
   - extra-android-m2repository
   - extra-google-google_play_services
   
 before_install:
-- yes | sdkmanager "platforms;android-27"
+- yes | sdkmanager "platforms;android-28"
 
 script:
   # Unit Test

app/build.gradle

@@ -6,23 +6,30 @@ buildscript {
 
     dependencies {
         classpath 'io.fabric.tools:gradle:1.+'
-        classpath 'com.dicedmelon.gradle:jacoco-android:0.1.3'
+        classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
+        classpath 'de.undercouch:gradle-download-task:3.4.3'
     }
 }
-apply plugin: "com.android.application"
+apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 apply plugin: 'com.google.gms.google-services'
-apply plugin: "io.fabric"
+apply plugin: 'io.fabric'
-apply plugin: "jacoco-android"
+apply plugin: 'jacoco-android'
 apply plugin: 'com.jakewharton.butterknife'
+apply plugin: 'de.undercouch.download'
+
+
+jacoco {
+    toolVersion = "0.8.3"
+}
 
 ext {
-    supportLibraryVersion = "27.1.1"
+    supportLibraryVersion = "28.0.0"
     ormLiteVersion = "4.46"
     powermockVersion = "1.7.3"
     dexmakerVersion = "1.2"
-    butterknifeVersion = "8.8.1"
+    butterknifeVersion = "10.1.0"
 }
 
 
@@ -97,19 +104,19 @@ tasks.matching { it instanceof Test }.all {
 }
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 23
-        targetSdkVersion 25
+        targetSdkVersion 28
         multiDexEnabled true
         versionCode 1500
-        version "2.3.1-dev"
+        version "2.4-dev"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
         buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'
         buildConfigField "String", "HEAD", '"' + generateGitBuild() + '"'
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         // if you change minSdkVersion to less than 11, you need to change executeTask for wear
 
         ndk {
@@ -188,8 +195,15 @@ android {
     }
 
     testOptions {
-        unitTests.returnDefaultValues = true
+        unitTests {
-        unitTests.includeAndroidResources = true
+            returnDefaultValues = true
+            includeAndroidResources = true
+
+            all {
+                maxParallelForks = 10
+                forkEvery = 20
+            }
+        }
     }
 
     useLibrary "org.apache.http.legacy"
@@ -205,29 +219,24 @@ allprojects {
     }
 }
 
-configurations {
-    libs
-}
-
 dependencies {
     wearApp project(':wear')
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.google.android.gms:play-services-wearable:16.0.1'
-    implementation 'com.google.firebase:firebase-core:16.0.8'
+    implementation 'com.google.firebase:firebase-core:16.0.9'
     implementation("com.crashlytics.sdk.android:crashlytics:2.9.9@aar") {
         transitive = true;
     }
-    libs "MilosKozak:danars-support-lib:master@zip"
 
-    implementation "com.android.support:appcompat-v7:${supportLibraryVersion}"
+    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation "com.android.support:support-v13:${supportLibraryVersion}"
+    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
-    implementation "com.android.support:support-v4:${supportLibraryVersion}"
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation "com.android.support:cardview-v7:${supportLibraryVersion}"
+    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation "com.android.support:recyclerview-v7:${supportLibraryVersion}"
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
-    implementation "com.android.support:gridlayout-v7:${supportLibraryVersion}"
+    implementation 'androidx.gridlayout:gridlayout:1.0.0'
-    implementation "com.android.support:design:${supportLibraryVersion}"
+    implementation 'com.google.android.material:material:1.0.0'
-    implementation "com.android.support:percent:${supportLibraryVersion}"
+    implementation 'androidx.percentlayout:percentlayout:1.0.0'
     implementation "com.wdullaer:materialdatetimepicker:2.3.0"
     implementation "com.squareup:otto:1.3.7"
     implementation "com.j256.ormlite:ormlite-core:${ormLiteVersion}"
@@ -240,7 +249,7 @@ dependencies {
     // Graphview cannot be upgraded
     implementation "com.jjoe64:graphview:4.0.1"
     implementation "com.joanzapata.iconify:android-iconify-fontawesome:2.1.1"
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation(name: "android-edittext-validator-v1.3.4-mod", ext: "aar")
     implementation 'com.madgag.spongycastle:core:1.58.0.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
@@ -252,7 +261,7 @@ dependencies {
         // excluding org.json which is provided by Android
         exclude group: "org.json", module: "json"
     }
-    implementation "com.google.code.gson:gson:2.8.2"
+    implementation "com.google.code.gson:gson:2.8.5"
     implementation "com.google.guava:guava:24.1-jre"
 
     implementation "net.danlew:android.joda:2.9.9.1"
@@ -274,7 +283,7 @@ dependencies {
     testImplementation "org.powermock:powermock-module-junit4:${powermockVersion}"
     testImplementation "joda-time:joda-time:2.9.9"
     testImplementation "com.google.truth:truth:0.39"
-    testImplementation 'org.robolectric:robolectric:3.8'
+    testImplementation 'org.robolectric:robolectric:4.2.1'
     testImplementation "org.skyscreamer:jsonassert:1.5.0"
 
     androidTestImplementation "org.mockito:mockito-core:2.8.47"
@@ -283,16 +292,20 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
-task unzip(type: Copy) {
-    def zipPath = configurations.libs.find { it.name.startsWith("danars") }
-    def zipFile = file(zipPath)
-    def outputDir = file("${buildDir}/unpacked/dist")
 
-    from zipTree(zipFile)
+task downloadZipFile(type: Download) {
+    src 'https://github.com/MilosKozak/danars-support-lib/archive/master.zip'
+    dest new File(buildDir, 'danars.zip')
+}
+
+task downloadAndUnzipFile(dependsOn: downloadZipFile, type: Copy) {
+    from zipTree(downloadZipFile.dest)
+    def outputDir = file("${buildDir}/unpacked/dist")
     into outputDir
 }
 
-task copyLibs(dependsOn: unzip, type: Copy) {
+
+task copyLibs(dependsOn: downloadAndUnzipFile, type: Copy) {
     def src = file("${buildDir}/unpacked/dist/danars-support-lib-master")
     def target = file("src/main/jniLibs/")
 

app/src/main/AndroidManifest.xml

@@ -17,11 +17,12 @@
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="com.google.android.permission.PROVIDE_BACKGROUND" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="sugar.free.sightremote.HISTORY_BROADCASTS" />
+    <uses-permission android:name="com.dexcom.cgm.EXTERNAL_PERMISSION" />
 
     <uses-permission-sdk-23 android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
 
@@ -35,13 +36,15 @@
         android:label="@string/app_name"
         android:roundIcon="${appIconRound}"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme.NoActionBar">
+        android:theme="@style/AppTheme.NoActionBar"
+        android:fullBackupContent="true">
         <meta-data
             android:name="com.google.android.gms.car.application"
             android:resource="@xml/automotive_app_desc" />
 
         <activity android:name=".MainActivity">
             <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
@@ -86,10 +89,8 @@
                 <action android:name="com.eveningoutpost.dexdrip.NS_EMULATOR"/>
                 <!-- Receiver from glimp -->
                 <action android:name="it.ct.glicemia.ACTION_GLUCOSE_MEASURED"/>
-                <!-- Receiver from DexcomG5 -->
+                <!-- Receiver from Dexcom -->
-                <action android:name="com.dexcom.cgm.DATA"/>
+                <action android:name="com.dexcom.cgm.EXTERNAL_BROADCAST"/>
-                <action android:name="com.dexcom.cgm.AndroidAPSEVGCallback.BROADCAST"/>
-                <action android:name="com.dexcom.cgm.g5.AndroidAPSEVGCallback.BROADCAST"/>
                 <!-- Receiver from Poctech -->
                 <action android:name="com.china.poctech.data"/>
                 <!-- Receiver from Tomato -->
@@ -148,7 +149,7 @@
         </receiver>
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
@@ -285,6 +286,10 @@
             android:name=".plugins.pump.insight.activities.InsightPairingInformationActivity"
             android:label="@string/pairing_information"
             android:theme="@style/AppTheme" />
+        <activity android:name=".activities.RequestDexcomPermissionActivity" />
+
+        <uses-library android:name="org.apache.http.legacy" android:required="false"/>
+
     </application>
 
 </manifest>

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

@@ -7,16 +7,16 @@ import android.graphics.Rect;
 import android.os.Bundle;
 import android.os.PersistableBundle;
 import android.os.PowerManager;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.design.widget.NavigationView;
+import com.google.android.material.navigation.NavigationView;
-import android.support.design.widget.TabLayout;
+import com.google.android.material.tabs.TabLayout;
-import android.support.v4.app.ActivityCompat;
+import androidx.core.app.ActivityCompat;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
-import android.support.v4.widget.DrawerLayout;
+import androidx.drawerlayout.widget.DrawerLayout;
-import android.support.v7.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.ActionBarDrawerToggle;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.text.SpannableString;
 import android.text.method.LinkMovementMethod;
 import android.text.util.Linkify;

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

@@ -4,9 +4,9 @@ import android.app.Application;
 import android.content.IntentFilter;
 import android.content.res.Resources;
 import android.os.SystemClock;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.annotation.PluralsRes;
+import androidx.annotation.PluralsRes;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.crashlytics.android.Crashlytics;
 import com.google.firebase.analytics.FirebaseAnalytics;
@@ -73,8 +73,7 @@ import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin;
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref0Plugin;
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin;
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityWeightedAveragePlugin;
-import info.nightscout.androidaps.plugins.source.SourceDexcomG5Plugin;
+import info.nightscout.androidaps.plugins.source.SourceDexcomPlugin;
-import info.nightscout.androidaps.plugins.source.SourceDexcomG6Plugin;
 import info.nightscout.androidaps.plugins.source.SourceEversensePlugin;
 import info.nightscout.androidaps.plugins.source.SourceGlimpPlugin;
 import info.nightscout.androidaps.plugins.source.SourceMM640gPlugin;
@@ -193,8 +192,7 @@ public class MainApp extends Application {
             pluginsList.add(SourceNSClientPlugin.getPlugin());
             pluginsList.add(SourceMM640gPlugin.getPlugin());
             pluginsList.add(SourceGlimpPlugin.getPlugin());
-            pluginsList.add(SourceDexcomG5Plugin.getPlugin());
+            pluginsList.add(SourceDexcomPlugin.INSTANCE);
-            pluginsList.add(SourceDexcomG6Plugin.getPlugin());
             pluginsList.add(SourcePoctechPlugin.getPlugin());
             pluginsList.add(SourceTomatoPlugin.getPlugin());
             pluginsList.add(SourceEversensePlugin.getPlugin());

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

@@ -2,9 +2,9 @@ package info.nightscout.androidaps.activities;
 
 import android.os.Bundle;
 import android.os.SystemClock;
-import android.support.v4.content.res.ResourcesCompat;
+import androidx.core.content.res.ResourcesCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
-import android.support.v7.widget.PopupMenu;
+import androidx.appcompat.widget.PopupMenu;
 import android.text.SpannableString;
 import android.text.style.ForegroundColorSpan;
 import android.view.Menu;

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

@@ -39,9 +39,9 @@ import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref0Plugin;
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin;
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityWeightedAveragePlugin;
 import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin;
-import info.nightscout.androidaps.plugins.source.SourceDexcomG5Plugin;
 import info.nightscout.androidaps.plugins.general.wear.WearPlugin;
 import info.nightscout.androidaps.plugins.general.xdripStatusline.StatuslinePlugin;
+import info.nightscout.androidaps.plugins.source.SourceDexcomPlugin;
 import info.nightscout.androidaps.utils.LocaleHelper;
 import info.nightscout.androidaps.utils.OKDialog;
 import info.nightscout.androidaps.utils.SP;
@@ -145,7 +145,7 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
 
                 addPreferencesFromResource(R.xml.pref_overview);
 
-                addPreferencesFromResourceIfEnabled(SourceDexcomG5Plugin.getPlugin(), PluginType.BGSOURCE);
+                addPreferencesFromResourceIfEnabled(SourceDexcomPlugin.INSTANCE, PluginType.BGSOURCE);
                 addPreferencesFromResourceIfEnabled(CareportalPlugin.getPlugin(), PluginType.GENERAL);
                 addPreferencesFromResourceIfEnabled(SafetyPlugin.getPlugin(), PluginType.CONSTRAINTS);
                 if (Config.APS) {

app/src/main/java/info/nightscout/androidaps/activities/RequestDexcomPermissionActivity.kt

@@ -0,0 +1,25 @@
+package info.nightscout.androidaps.activities
+
+import android.os.Build
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import info.nightscout.androidaps.plugins.source.SourceDexcomPlugin
+
+class RequestDexcomPermissionActivity : AppCompatActivity() {
+
+    private val requestCode = "AndroidAPS <3".map { it.toInt() }.sum()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            requestPermissions(arrayOf(SourceDexcomPlugin.PERMISSION), requestCode)
+        } else {
+            finish()
+        }
+    }
+
+    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
+        finish()
+    }
+
+}

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

@@ -2,9 +2,9 @@ package info.nightscout.androidaps.activities;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 

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

@@ -4,7 +4,7 @@ import android.app.Activity;
 import android.graphics.Color;
 import android.graphics.Rect;
 import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.MotionEvent;

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

@@ -1,11 +1,9 @@
 package info.nightscout.androidaps.data;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
 
-import javax.annotation.Nonnull;
-
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.interfaces.Constraint;

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

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.data;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.util.LongSparseArray;
+import androidx.collection.LongSparseArray;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -1,10 +1,8 @@
 package info.nightscout.androidaps.data;
 
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.util.LongSparseArray;
 
-import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.interfaces.Interval;
 
 /**

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

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.data;
 
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import info.nightscout.androidaps.interfaces.Interval;
 

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

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.data;
 
-import android.support.v4.util.LongSparseArray;
+import androidx.collection.LongSparseArray;
 
 import org.json.JSONArray;
 import org.json.JSONException;

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

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.data;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.util.LongSparseArray;
+import androidx.collection.LongSparseArray;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.data;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.util.ArrayMap;
+import androidx.collection.ArrayMap;
 
 import org.json.JSONException;
 import org.json.JSONObject;

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

@@ -50,7 +50,7 @@ public class QuickWizardEntry {
             useTemptarget: 0
         }
      */
-    public QuickWizardEntry() {
+    QuickWizardEntry() {
         String emptyData = "{\"buttonText\":\"\",\"carbs\":0,\"validFrom\":0,\"validTo\":86340}";
         try {
             storage = new JSONObject(emptyData);
@@ -60,18 +60,17 @@ public class QuickWizardEntry {
         position = -1;
     }
 
-    public QuickWizardEntry(JSONObject entry, int position) {
+    QuickWizardEntry(JSONObject entry, int position) {
         storage = entry;
         this.position = position;
     }
 
-    public Boolean isActive() {
+    Boolean isActive() {
         return Profile.secondsFromMidnight() >= validFrom() && Profile.secondsFromMidnight() <= validTo();
     }
 
-    public BolusWizard doCalc(Profile profile, TempTarget tempTarget, BgReading lastBG, boolean _synchronized) {
+    public BolusWizard doCalc(Profile profile, String profileName, BgReading lastBG, boolean _synchronized) {
-        BolusWizard wizard = new BolusWizard();
+        final TempTarget tempTarget = TreatmentsPlugin.getPlugin().getTempTargetFromHistory();
-
         //BG
         double bg = 0;
         if (lastBG != null && useBG() == YES) {
@@ -86,11 +85,6 @@ public class QuickWizardEntry {
                 cob = cobInfo.displayCob;
         }
 
-        // Temp target
-        if (useTempTarget() == NO) {
-            tempTarget = null;
-        }
-
         // Bolus IOB
         boolean bolusIOB = false;
         if (useBolusIOB() == YES) {
@@ -130,8 +124,7 @@ public class QuickWizardEntry {
             trend = true;
         }
 
-        wizard.doCalc(profile, tempTarget, carbs(), cob, bg, 0d, bolusIOB, basalIOB, superBolus, trend);
+        return new BolusWizard(profile, profileName, tempTarget, carbs(), cob, bg, 0d, 100, true, useCOB() == YES, bolusIOB, basalIOB, superBolus, useTempTarget() == YES, trend, "QuickWizard");
-        return wizard;
     }
 
     public String buttonText() {

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

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.db;
 import android.content.Context;
 import android.database.DatabaseUtils;
 import android.database.sqlite.SQLiteDatabase;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.j256.ormlite.android.apptools.OrmLiteSqliteOpenHelper;
 import com.j256.ormlite.dao.CloseableIterator;

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

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.db;
 
 import android.graphics.Color;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;

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

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.events;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import info.nightscout.androidaps.db.BgReading;
 

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

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.events;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import info.nightscout.androidaps.plugins.treatments.Treatment;
 

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

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.interfaces;
 
 import android.os.SystemClock;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.interfaces;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import info.nightscout.androidaps.data.ProfileStore;
 

app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java

@@ -10,8 +10,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
 
 import com.squareup.otto.Subscribe;
 
@@ -644,6 +644,17 @@ public class LoopPlugin extends PluginBase {
         TreatmentsInterface activeTreatments = TreatmentsPlugin.getPlugin();
 
         LoopPlugin.getPlugin().disconnectTo(System.currentTimeMillis() + durationInMinutes * 60 * 1000L);
+
+        if (pump.getPumpDescription().tempBasalStyle == PumpDescription.ABSOLUTE) {
+            ConfigBuilderPlugin.getPlugin().getCommandQueue().tempBasalAbsolute(0, durationInMinutes, true, profile, new Callback() {
+                @Override
+                public void run() {
+                    if (!result.success) {
+                        ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.gs(R.string.tempbasaldeliveryerror));
+                    }
+                }
+            });
+        } else {
             ConfigBuilderPlugin.getPlugin().getCommandQueue().tempBasalPercent(0, durationInMinutes, true, profile, new Callback() {
                 @Override
                 public void run() {
@@ -652,6 +663,8 @@ public class LoopPlugin extends PluginBase {
                     }
                 }
             });
+        }
+
         if (pump.getPumpDescription().isExtendedBolusCapable && activeTreatments.isInHistoryExtendedBoluslInProgress()) {
             ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelExtended(new Callback() {
                 @Override

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

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.common;
 
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 import butterknife.Unbinder;
 import info.nightscout.androidaps.MainApp;

app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.java

@@ -3,8 +3,8 @@ package info.nightscout.androidaps.plugins.configBuilder;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.StringRes;
+import androidx.annotation.StringRes;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

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

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.configBuilder;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/DetailedBolusInfoStorage.java

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.configBuilder;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

@@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.configBuilder;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.google.firebase.analytics.FirebaseAnalytics;
 import com.squareup.otto.Subscribe;

app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.java

@@ -4,11 +4,11 @@ import android.app.Activity;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v7.widget.CardView;
+import androidx.cardview.widget.CardView;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
-import android.support.v7.widget.LinearSmoothScroller;
+import androidx.recyclerview.widget.LinearSmoothScroller;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;

app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective.java

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.constraints.objectives.objectives;
 
-import android.support.annotation.StringRes;
+import androidx.annotation.StringRes;
 
 import java.util.ArrayList;
 import java.util.Date;

app/src/main/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPlugin.java

@@ -13,10 +13,10 @@ import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin;
 import info.nightscout.androidaps.plugins.aps.openAPSMA.OpenAPSMAPlugin;
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin;
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin;
@@ -196,7 +196,7 @@ public class SafetyPlugin extends PluginBase implements ConstraintsInterface {
 
         PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
         if (pump != null) {
-            double rounded = Round.roundTo(insulin.value(), pump.getPumpDescription().pumpType.determineCorrectBolusSize(insulin.value()));
+            double rounded = pump.getPumpDescription().pumpType.determineCorrectBolusSize(insulin.value());
             insulin.setIfDifferent(rounded, MainApp.gs(R.string.pumplimit), this);
         }
         return insulin;
@@ -213,7 +213,7 @@ public class SafetyPlugin extends PluginBase implements ConstraintsInterface {
 
         PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
         if (pump != null) {
-            double rounded = Round.roundTo(insulin.value(), pump.getPumpDescription().pumpType.determineCorrectExtendedBolusSize(insulin.value()));
+            double rounded = pump.getPumpDescription().pumpType.determineCorrectExtendedBolusSize(insulin.value());
             insulin.setIfDifferent(rounded, MainApp.gs(R.string.pumplimit), this);
         }
         return insulin;

app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.java

@@ -5,8 +5,8 @@ import android.app.Activity;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
-import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

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

@@ -3,8 +3,8 @@ package info.nightscout.androidaps.plugins.general.actions.dialogs;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.text.Editable;
 import android.text.Html;
 import android.text.TextWatcher;

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

@@ -4,8 +4,8 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

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

@@ -3,8 +3,8 @@ package info.nightscout.androidaps.plugins.general.actions.dialogs;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/CareportalFragment.java

@@ -4,7 +4,7 @@ package info.nightscout.androidaps.plugins.general.careportal;
 import android.app.Activity;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

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

@@ -3,8 +3,8 @@ package info.nightscout.androidaps.plugins.general.careportal.Dialogs;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.text.format.DateFormat;

app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.java

@@ -4,9 +4,9 @@ import android.app.Activity;
 import android.content.DialogInterface;
 import android.graphics.Paint;
 import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.LayoutInflater;

app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodService.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.food;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.j256.ormlite.android.apptools.OpenHelperManager;
 import com.j256.ormlite.android.apptools.OrmLiteBaseService;

app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.java

@@ -8,9 +8,9 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.os.Environment;
 import android.preference.PreferenceManager;
-import android.support.v4.app.ActivityCompat;
+import androidx.core.app.ActivityCompat;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.java

@@ -2,8 +2,8 @@ package info.nightscout.androidaps.plugins.general.maintenance;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePlugin.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.maintenance;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.support.v4.content.FileProvider;
+import androidx.core.content.FileProvider;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/LogSettingActivity.java

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.general.maintenance.activities;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.LinearLayout;

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java

@@ -7,8 +7,8 @@ import android.content.pm.ResolveInfo;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import org.apache.commons.lang3.StringUtils;
 import org.json.JSONArray;

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastAckAlarm.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastAlarm.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import org.json.JSONObject;
 

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastAnnouncement.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import org.json.JSONObject;
 

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastCals.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import org.json.JSONArray;
 

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastClearAlarm.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import org.json.JSONObject;
 

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastDeviceStatus.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import org.json.JSONArray;
 

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastFood.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import org.json.JSONArray;
 

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastMbgs.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import org.json.JSONArray;
 

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastProfile.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastSgvs.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import org.json.JSONArray;
 

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastStatus.java

@@ -4,7 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

@@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import org.json.JSONArray;
 import org.json.JSONException;

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/broadcasts/BroadcastUrgentAlarm.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.broadcasts;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import org.json.JSONObject;
 

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.data;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.json.JSONException;
 import org.json.JSONObject;

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/receivers/RestartReceiver.java

@@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.receivers;
 
 import android.content.Context;
 import android.content.Intent;
-import android.support.v4.content.WakefulBroadcastReceiver;
+import androidx.legacy.content.WakefulBroadcastReceiver;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart;

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.overview;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.NotificationManager;
-import android.arch.core.util.Function;
+import androidx.arch.core.util.Function;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
@@ -12,14 +12,14 @@ import android.graphics.Color;
 import android.graphics.Paint;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
-import android.support.v4.content.res.ResourcesCompat;
+import androidx.core.content.res.ResourcesCompat;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
-import android.support.v7.widget.PopupMenu;
+import androidx.appcompat.widget.PopupMenu;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.SpannableString;
 import android.text.style.ForegroundColorSpan;
 import android.util.DisplayMetrics;
@@ -37,12 +37,9 @@ import android.widget.TextView;
 import com.jjoe64.graphview.GraphView;
 import com.squareup.otto.Subscribe;
 
-import org.json.JSONException;
-import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.text.DecimalFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
@@ -55,8 +52,6 @@ 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.plugins.iob.iobCobCalculator.GlucoseStatus;
 import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.QuickWizardEntry;
@@ -94,24 +89,21 @@ import info.nightscout.androidaps.plugins.general.careportal.OptionsToShow;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSDeviceStatus;
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSSettingsStatus;
+import info.nightscout.androidaps.plugins.general.overview.activities.QuickWizardListActivity;
 import info.nightscout.androidaps.plugins.general.overview.dialogs.CalibrationDialog;
-import info.nightscout.androidaps.plugins.general.overview.dialogs.ErrorHelperActivity;
 import info.nightscout.androidaps.plugins.general.overview.dialogs.NewCarbsDialog;
 import info.nightscout.androidaps.plugins.general.overview.dialogs.NewInsulinDialog;
 import info.nightscout.androidaps.plugins.general.overview.dialogs.NewTreatmentDialog;
 import info.nightscout.androidaps.plugins.general.overview.dialogs.WizardDialog;
-import info.nightscout.androidaps.plugins.general.overview.activities.QuickWizardListActivity;
 import info.nightscout.androidaps.plugins.general.overview.graphData.GraphData;
-import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationRecyclerViewAdapter;
-import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationStore;
 import info.nightscout.androidaps.plugins.general.wear.ActionStringHandler;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensData;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.CobInfo;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventIobCalculationProgress;
-import info.nightscout.androidaps.plugins.source.SourceDexcomG5Plugin;
+import info.nightscout.androidaps.plugins.source.SourceDexcomPlugin;
-import info.nightscout.androidaps.plugins.source.SourceDexcomG6Plugin;
 import info.nightscout.androidaps.plugins.source.SourceXdripPlugin;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.plugins.treatments.fragments.ProfileViewerDialog;
@@ -663,8 +655,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
     @Override
     public void onClick(View v) {
         boolean xdrip = SourceXdripPlugin.getPlugin().isEnabled(PluginType.BGSOURCE);
-        boolean g5 = SourceDexcomG5Plugin.getPlugin().isEnabled(PluginType.BGSOURCE);
+        boolean dexcom = SourceDexcomPlugin.INSTANCE.isEnabled(PluginType.BGSOURCE);
-        boolean g6 = SourceDexcomG6Plugin.getPlugin().isEnabled(PluginType.BGSOURCE);
         String units = ProfileFunctions.getInstance().getProfileUnits();
 
         FragmentManager manager = getFragmentManager();
@@ -687,10 +678,16 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 if (xdrip) {
                     CalibrationDialog calibrationDialog = new CalibrationDialog();
                     calibrationDialog.show(manager, "CalibrationDialog");
-                } else if (g5 || g6) {
+                } else if (dexcom) {
                     try {
+                        String packageName = SourceDexcomPlugin.INSTANCE.findDexcomPackageName();
+                        if (packageName != null) {
                             Intent i = new Intent("com.dexcom.cgm.activities.MeterEntryActivity");
+                            i.setPackage(packageName);
                             startActivity(i);
+                        } else {
+                            ToastUtils.showToastInUiThread(getActivity(), MainApp.gs(R.string.dexcom_app_not_installed));
+                        }
                     } catch (ActivityNotFoundException e) {
                         ToastUtils.showToastInUiThread(getActivity(), MainApp.gs(R.string.g5appnotdetected));
                     }
@@ -699,14 +696,14 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             case R.id.overview_cgmbutton:
                 if (xdrip)
                     openCgmApp("com.eveningoutpost.dexdrip");
-                else if (g5 && units.equals(Constants.MGDL))
+                else if (dexcom) {
-                    openCgmApp("com.dexcom.cgm.region5.mgdl");
+                    String packageName = SourceDexcomPlugin.INSTANCE.findDexcomPackageName();
-                else if (g5 && units.equals(Constants.MMOL))
+                    if (packageName != null) {
-                    openCgmApp("com.dexcom.cgm.region5.mmol");
+                        openCgmApp(packageName);
-                else if (g6 && units.equals(Constants.MGDL))
+                    } else {
-                    openCgmApp("com.dexcom.g6.region3.mgdl");
+                        ToastUtils.showToastInUiThread(getActivity(), MainApp.gs(R.string.dexcom_app_not_installed));
-                else if (g6 && units.equals(Constants.MMOL))
+                    }
-                    openCgmApp("com.dexcom.g6.region3.mmol");
+                }
                 break;
             case R.id.overview_treatmentbutton:
                 NewTreatmentDialog treatmentDialogFragment = new NewTreatmentDialog();
@@ -783,122 +780,25 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
     void onClickQuickwizard() {
         final BgReading actualBg = DatabaseHelper.actualBg();
         final Profile profile = ProfileFunctions.getInstance().getProfile();
-        final TempTarget tempTarget = TreatmentsPlugin.getPlugin().getTempTargetFromHistory();
+        final String profileName = ProfileFunctions.getInstance().getProfileName();
+        final PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
 
         final QuickWizardEntry quickWizardEntry = OverviewPlugin.getPlugin().quickWizard.getActive();
-        if (quickWizardEntry != null && actualBg != null && profile != null) {
+        if (quickWizardEntry != null && actualBg != null && profile != null && pump != null) {
             quickWizardButton.setVisibility(View.VISIBLE);
-            final BolusWizard wizard = quickWizardEntry.doCalc(profile, tempTarget, actualBg, true);
+            final BolusWizard wizard = quickWizardEntry.doCalc(profile, profileName, actualBg, true);
 
-            final JSONObject boluscalcJSON = new JSONObject();
+            if (wizard.getCalculatedTotalInsulin() > 0d && quickWizardEntry.carbs() > 0d) {
-            try {
-                boluscalcJSON.put("eventTime", DateUtil.toISOString(new Date()));
-                boluscalcJSON.put("targetBGLow", wizard.targetBGLow);
-                boluscalcJSON.put("targetBGHigh", wizard.targetBGHigh);
-                boluscalcJSON.put("isf", wizard.sens);
-                boluscalcJSON.put("ic", wizard.ic);
-                boluscalcJSON.put("iob", -(wizard.insulingFromBolusIOB + wizard.insulingFromBasalsIOB));
-                boluscalcJSON.put("bolusiobused", true);
-                boluscalcJSON.put("basaliobused", true);
-                boluscalcJSON.put("bg", actualBg.valueToUnits(profile.getUnits()));
-                boluscalcJSON.put("insulinbg", wizard.insulinFromBG);
-                boluscalcJSON.put("insulinbgused", true);
-                boluscalcJSON.put("bgdiff", wizard.bgDiff);
-                boluscalcJSON.put("insulincarbs", wizard.insulinFromCarbs);
-                boluscalcJSON.put("carbs", quickWizardEntry.carbs());
-                boluscalcJSON.put("othercorrection", 0d);
-                boluscalcJSON.put("insulintrend", wizard.insulinFromTrend);
-                boluscalcJSON.put("insulin", wizard.calculatedTotalInsulin);
-            } catch (JSONException e) {
-                log.error("Unhandled exception", e);
-            }
-            if (wizard.calculatedTotalInsulin > 0d && quickWizardEntry.carbs() > 0d) {
-                DecimalFormat formatNumber2decimalplaces = new DecimalFormat("0.00");
-                String confirmMessage = MainApp.gs(R.string.entertreatmentquestion);
-
-                Double insulinAfterConstraints = MainApp.getConstraintChecker().applyBolusConstraints(new Constraint<>(wizard.calculatedTotalInsulin)).value();
                 Integer carbsAfterConstraints = MainApp.getConstraintChecker().applyCarbsConstraints(new Constraint<>(quickWizardEntry.carbs())).value();
 
-                confirmMessage += "\n" + MainApp.gs(R.string.bolus) + ": " + formatNumber2decimalplaces.format(insulinAfterConstraints) + "U";
+                if (Math.abs(wizard.getInsulinAfterConstraints() - wizard.getCalculatedTotalInsulin()) >= pump.getPumpDescription().pumpType.determineCorrectBolusStepSize(wizard.getInsulinAfterConstraints()) || !carbsAfterConstraints.equals(quickWizardEntry.carbs())) {
-                confirmMessage += "\n" + MainApp.gs(R.string.carbs) + ": " + carbsAfterConstraints + "g";
+                    OKDialog.show(getContext(), MainApp.gs(R.string.treatmentdeliveryerror), MainApp.gs(R.string.constraints_violation) + "\n" + MainApp.gs(R.string.changeyourinput), null);
-
-                if (Math.abs(insulinAfterConstraints - wizard.calculatedTotalInsulin) >= 0.01 || !carbsAfterConstraints.equals(quickWizardEntry.carbs())) {
-                    AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
-                    builder.setTitle(MainApp.gs(R.string.treatmentdeliveryerror));
-                    builder.setMessage(MainApp.gs(R.string.constraints_violation) + "\n" + MainApp.gs(R.string.changeyourinput));
-                    builder.setPositiveButton(MainApp.gs(R.string.ok), null);
-                    builder.show();
                     return;
                 }
 
-                final Double finalInsulinAfterConstraints = insulinAfterConstraints;
+                wizard.confirmAndExecute(getContext());
-                final Integer finalCarbsAfterConstraints = carbsAfterConstraints;
-                final Context context = getContext();
-                final AlertDialog.Builder builder = new AlertDialog.Builder(context);
-                accepted = false;
-                builder.setTitle(MainApp.gs(R.string.confirmation));
-                builder.setMessage(confirmMessage);
-                builder.setPositiveButton(MainApp.gs(R.string.ok), (dialog, id) -> {
-                    synchronized (builder) {
-                        if (accepted) {
-                            if (L.isEnabled(L.OVERVIEW))
-                                log.debug("guarding: already accepted");
-                            return;
-                        }
-                        accepted = true;
-                        if (Math.abs(insulinAfterConstraints - wizard.calculatedTotalInsulin) >= 0.01 || finalCarbsAfterConstraints > 0) {
-                            if (wizard.superBolus) {
-                                final LoopPlugin loopPlugin = LoopPlugin.getPlugin();
-                                if (loopPlugin.isEnabled(PluginType.LOOP)) {
-                                    loopPlugin.superBolusTo(System.currentTimeMillis() + T.hours(2).msecs());
-                                    MainApp.bus().post(new EventRefreshOverview("WizardDialog"));
-                                }
-                                ConfigBuilderPlugin.getPlugin().getCommandQueue().tempBasalPercent(0, 120, true, profile, 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.gs(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;
-                            detailedBolusInfo.carbs = finalCarbsAfterConstraints;
-                            detailedBolusInfo.context = context;
-                            detailedBolusInfo.boluscalc = boluscalcJSON;
-                            detailedBolusInfo.source = Source.USER;
-                            if (finalInsulinAfterConstraints > 0 || ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().storesCarbInfo) {
-                                ConfigBuilderPlugin.getPlugin().getCommandQueue().bolus(detailedBolusInfo, 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.gs(R.string.treatmentdeliveryerror));
-                                            i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                            MainApp.instance().startActivity(i);
-                                        }
-                                    }
-                                });
-                            } else {
-                                TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, false);
-                            }
-                        }
-                    }
-                });
-                builder.setNegativeButton(MainApp.gs(R.string.cancel), null);
-                builder.show();
-            }
-        }
-
     }
 
     @Override
@@ -1064,7 +964,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             timeView.setText(DateUtil.timeString(new Date()));
         }
 
-        updateNotifications();
+        OverviewPlugin.getPlugin().notificationStore.updateNotifications(notificationsView);
 
         pumpStatusLayout.setVisibility(View.GONE);
         loopStatusLayout.setVisibility(View.GONE);
@@ -1083,6 +983,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         final PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
 
         final Profile profile = ProfileFunctions.getInstance().getProfile();
+        final String profileName = ProfileFunctions.getInstance().getProfileName();
 
         final String units = profile.getUnits();
         final double lowLine = OverviewPlugin.getPlugin().determineLowLine(units);
@@ -1190,10 +1091,10 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
 
         // **** Calibration & CGM buttons ****
         boolean xDripIsBgSource = MainApp.getSpecificPlugin(SourceXdripPlugin.class) != null && MainApp.getSpecificPlugin(SourceXdripPlugin.class).isEnabled(PluginType.BGSOURCE);
-        boolean g5IsBgSource = MainApp.getSpecificPlugin(SourceDexcomG5Plugin.class) != null && MainApp.getSpecificPlugin(SourceDexcomG5Plugin.class).isEnabled(PluginType.BGSOURCE);
+        boolean dexcomIsSource = SourceDexcomPlugin.INSTANCE.isEnabled(PluginType.BGSOURCE);
         boolean bgAvailable = DatabaseHelper.actualBg() != null;
         if (calibrationButton != null) {
-            if ((xDripIsBgSource || g5IsBgSource) && bgAvailable && SP.getBoolean(R.string.key_show_calibration_button, true)) {
+            if ((xDripIsBgSource || dexcomIsSource) && bgAvailable && SP.getBoolean(R.string.key_show_calibration_button, true)) {
                 calibrationButton.setVisibility(View.VISIBLE);
             } else {
                 calibrationButton.setVisibility(View.GONE);
@@ -1202,7 +1103,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         if (cgmButton != null) {
             if (xDripIsBgSource && SP.getBoolean(R.string.key_show_cgm_button, false)) {
                 cgmButton.setVisibility(View.VISIBLE);
-            } else if (g5IsBgSource && SP.getBoolean(R.string.key_show_cgm_button, false)) {
+            } else if (dexcomIsSource && SP.getBoolean(R.string.key_show_cgm_button, false)) {
                 cgmButton.setVisibility(View.VISIBLE);
             } else {
                 cgmButton.setVisibility(View.GONE);
@@ -1280,10 +1181,10 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         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 = quickWizardEntry.doCalc(profile, tempTarget, lastBG, false);
+            BolusWizard wizard = quickWizardEntry.doCalc(profile, profileName, lastBG, false);
-            text += " " + DecimalFormatter.toPumpSupportedBolus(wizard.calculatedTotalInsulin) + "U";
+            text += " " + DecimalFormatter.toPumpSupportedBolus(wizard.getCalculatedTotalInsulin()) + "U";
             quickWizardButton.setText(text);
-            if (wizard.calculatedTotalInsulin <= 0)
+            if (wizard.getCalculatedTotalInsulin() <= 0)
                 quickWizardButton.setVisibility(View.GONE);
         } else
             quickWizardButton.setVisibility(View.GONE);
@@ -1603,21 +1504,6 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             Profiler.log(log, from, updateGUIStart);
     }
 
-    //Notifications
-
-    void updateNotifications() {
-        NotificationStore nstore = OverviewPlugin.getPlugin().notificationStore;
-        nstore.removeExpired();
-        nstore.unSnooze();
-        if (nstore.store.size() > 0) {
-            NotificationRecyclerViewAdapter adapter = new NotificationRecyclerViewAdapter(nstore.store);
-            notificationsView.setAdapter(adapter);
-            notificationsView.setVisibility(View.VISIBLE);
-        } else {
-            notificationsView.setVisibility(View.GONE);
-        }
-    }
-
     public static void applyStatuslight(TextView view, String text, double value, double warnThreshold, double urgentThreshold, double invalid, boolean checkAscending) {
         Function<Double, Boolean> check = checkAscending ? (Double threshold) -> value >= threshold : (Double threshold) -> value <= threshold;
         if (value != invalid) {

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

@@ -2,11 +2,11 @@ package info.nightscout.androidaps.plugins.general.overview.activities;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
-import android.support.v7.widget.CardView;
+import androidx.cardview.widget.CardView;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/BolusProgressDialog.java

@@ -4,7 +4,7 @@ package info.nightscout.androidaps.plugins.general.overview.dialogs;
 import android.app.Activity;
 import android.os.Bundle;
 import android.os.SystemClock;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/BolusProgressHelperActivity.java

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.general.overview.dialogs;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 /**
  * Created by adrian on 09/02/17.

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/CalibrationDialog.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.overview.dialogs;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/EditQuickWizardDialog.java

@@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.general.overview.dialogs;
 
 
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/ErrorDialog.java

@@ -2,8 +2,9 @@ package info.nightscout.androidaps.plugins.general.overview.dialogs;
 
 
 import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -98,6 +99,9 @@ public class ErrorDialog extends DialogFragment implements View.OnClickListener
     private void startAlarm() {
         Intent alarm = new Intent(MainApp.instance().getApplicationContext(), AlarmSoundService.class);
         alarm.putExtra("soundid", soundId);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+            MainApp.instance().startForegroundService(alarm);
+        else
             MainApp.instance().startService(alarm);
     }
 

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/ErrorHelperActivity.java

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.general.overview.dialogs;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/NewCarbsDialog.java

@@ -2,8 +2,8 @@ package info.nightscout.androidaps.plugins.general.overview.dialogs;
 
 import android.os.Bundle;
 import android.os.HandlerThread;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.text.Editable;
 import android.text.Html;
 import android.text.TextWatcher;

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/NewInsulinDialog.java

@@ -4,8 +4,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.HandlerThread;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.text.Editable;
 import android.text.Html;
 import android.text.TextWatcher;
@@ -225,7 +225,7 @@ public class NewInsulinDialog extends DialogFragment implements OnClickListener
                 }
             }
 
-            if (Math.abs(insulinAfterConstraints - insulin) > pump.getPumpDescription().pumpType.determineCorrectBolusSize(insulinAfterConstraints))
+            if (Math.abs(insulinAfterConstraints - insulin) > pump.getPumpDescription().pumpType.determineCorrectBolusStepSize(insulinAfterConstraints))
                 actions.add("<font color='" + MainApp.gc(R.color.warning) + "'>" + MainApp.gs(R.string.bolusconstraintapplied) + "</font>");
 
             int eatingSoonTTDuration = SP.getInt(R.string.key_eatingsoon_duration, Constants.defaultEatingSoonTTDuration);

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/NewTreatmentDialog.java

@@ -4,8 +4,8 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.text.Editable;
 import android.text.Html;
 import android.text.TextWatcher;
@@ -141,7 +141,7 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
                         if (recordOnlyCheckbox.isChecked()) {
                             confirmMessage += "<br/><font color='" + MainApp.gc(R.color.warning) + "'>" + MainApp.gs(R.string.bolusrecordedonly) + "</font>";
                         }
-                        if (Math.abs(insulinAfterConstraints - insulin) > pump.getPumpDescription().pumpType.determineCorrectBolusSize(insulinAfterConstraints) || !Objects.equals(carbsAfterConstraints, carbs))
+                        if (Math.abs(insulinAfterConstraints - insulin) > pump.getPumpDescription().pumpType.determineCorrectBolusStepSize(insulinAfterConstraints) || !Objects.equals(carbsAfterConstraints, carbs))
                             confirmMessage += "<br/><font color='" + MainApp.gc(R.color.warning) + "'>" + MainApp.gs(R.string.bolusconstraintapplied) + "</font>";
                     }
                     if (carbsAfterConstraints > 0)

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/WizardDialog.java

@@ -2,13 +2,10 @@ package info.nightscout.androidaps.plugins.general.overview.dialogs;
 
 import android.app.Activity;
 import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.text.Editable;
-import android.text.Html;
 import android.text.TextWatcher;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -28,46 +25,35 @@ import android.widget.TextView;
 
 import com.squareup.otto.Subscribe;
 
-import org.json.JSONException;
-import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;
-import java.util.Date;
 
 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.IobTotal;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.ProfileStore;
 import info.nightscout.androidaps.db.BgReading;
-import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.db.DatabaseHelper;
-import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.db.TempTarget;
 import info.nightscout.androidaps.events.EventFeatureRunning;
-import info.nightscout.androidaps.events.EventRefreshOverview;
 import info.nightscout.androidaps.interfaces.Constraint;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.CobInfo;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.androidaps.utils.BolusWizard;
-import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.NumberPicker;
 import info.nightscout.androidaps.utils.SP;
 import info.nightscout.androidaps.utils.SafeParse;
+import info.nightscout.androidaps.utils.StringUtils;
 import info.nightscout.androidaps.utils.ToastUtils;
 
 public class WizardDialog extends DialogFragment implements OnClickListener, CompoundButton.OnCheckedChangeListener, Spinner.OnItemSelectedListener {
@@ -108,8 +94,7 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
     EditText notesEdit;
 
     Integer calculatedCarbs = 0;
-    Double calculatedTotalInsulin = 0d;
+    BolusWizard wizard;
-    JSONObject boluscalcJSON;
 
     Context context;
 
@@ -311,99 +296,8 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
                     return;
                 }
                 okClicked = true;
-                final Profile profile = ProfileFunctions.getInstance().getProfile();
+                wizard.confirmAndExecute(context);
-                final PumpInterface pump = ConfigBuilderPlugin.getPlugin().getActivePump();
-
-                if (pump != null && profile != null && (calculatedTotalInsulin > 0d || calculatedCarbs > 0d)) {
-                    String confirmMessage = MainApp.gs(R.string.entertreatmentquestion);
-
-                    Double insulinAfterConstraints = MainApp.getConstraintChecker().applyBolusConstraints(new Constraint<>(calculatedTotalInsulin)).value();
-                    Integer carbsAfterConstraints = MainApp.getConstraintChecker().applyCarbsConstraints(new Constraint<>(calculatedCarbs)).value();
-
-                    if (insulinAfterConstraints > 0)
-                        confirmMessage += "<br/>" + MainApp.gs(R.string.bolus) + ": " + "<font color='" + MainApp.gc(R.color.bolus) + "'>" + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints) + "U" + "</font>";
-                    if (carbsAfterConstraints > 0)
-                        confirmMessage += "<br/>" + MainApp.gs(R.string.carbs) + ": " + "<font color='" + MainApp.gc(R.color.carbs) + "'>" + carbsAfterConstraints + "g" + "</font>";
-
-                    if (Math.abs(insulinAfterConstraints - calculatedTotalInsulin) > pump.getPumpDescription().pumpType.determineCorrectBolusSize(insulinAfterConstraints) || !carbsAfterConstraints.equals(calculatedCarbs)) {
-                        confirmMessage += "<br/><font color='" + MainApp.gc(R.color.warning) + "'>" + MainApp.gs(R.string.bolusconstraintapplied) + "</font>";
-                    }
-
-                    final Double finalInsulinAfterConstraints = insulinAfterConstraints;
-                    final Integer finalCarbsAfterConstraints = carbsAfterConstraints;
-                    final Double bg = SafeParse.stringToDouble(editBg.getText());
-                    final int carbTime = SafeParse.stringToInt(editCarbTime.getText());
-                    final boolean useSuperBolus = superbolusCheckbox.isChecked();
-                    final String finalNotes = notesEdit.getText().toString();
-
-                    final AlertDialog.Builder builder = new AlertDialog.Builder(context);
-                    builder.setTitle(MainApp.gs(R.string.confirmation));
-                    builder.setMessage(Html.fromHtml(confirmMessage));
-                    builder.setPositiveButton(MainApp.gs(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) {
-                                    if (useSuperBolus) {
-                                        final LoopPlugin loopPlugin = LoopPlugin.getPlugin();
-                                        if (loopPlugin.isEnabled(PluginType.LOOP)) {
-                                            loopPlugin.superBolusTo(System.currentTimeMillis() + 2 * 60L * 60 * 1000);
-                                            MainApp.bus().post(new EventRefreshOverview("WizardDialog"));
-                                        }
-                                        ConfigBuilderPlugin.getPlugin().getCommandQueue().tempBasalPercent(0, 120, true, profile, 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.gs(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;
-                                    detailedBolusInfo.carbs = finalCarbsAfterConstraints;
-                                    detailedBolusInfo.context = context;
-                                    detailedBolusInfo.glucose = bg;
-                                    detailedBolusInfo.glucoseType = "Manual";
-                                    detailedBolusInfo.carbTime = carbTime;
-                                    detailedBolusInfo.boluscalc = boluscalcJSON;
-                                    detailedBolusInfo.source = Source.USER;
-                                    detailedBolusInfo.notes = finalNotes;
-                                    if (detailedBolusInfo.insulin > 0 || ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().storesCarbInfo) {
-                                        ConfigBuilderPlugin.getPlugin().getCommandQueue().bolus(detailedBolusInfo, 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.gs(R.string.treatmentdeliveryerror));
-                                                    i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                                    MainApp.instance().startActivity(i);
-                                                }
-                                            }
-                                        });
-                                    } else {
-                                        TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, false);
-                                    }
-                                }
-                            }
-                        }
-                    });
-                    builder.setNegativeButton(MainApp.gs(R.string.cancel), null);
-                    builder.show();
                 dismiss();
-                }
                 break;
             case R.id.cancel:
                 dismiss();
@@ -450,8 +344,8 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
         TreatmentsPlugin.getPlugin().updateTotalIOBTempBasals();
         IobTotal basalIob = TreatmentsPlugin.getPlugin().getLastCalculationTempBasals().round();
 
-        bolusIobInsulin.setText(DecimalFormatter.to2Decimal(-bolusIob.iob) + "U");
+        bolusIobInsulin.setText(StringUtils.formatInsulin(-bolusIob.iob));
-        basalIobInsulin.setText(DecimalFormatter.to2Decimal(-basalIob.basaliob) + "U");
+        basalIobInsulin.setText(StringUtils.formatInsulin(-basalIob.basaliob));
 
         calculateInsulin();
     }
@@ -460,13 +354,13 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
         ProfileStore profileStore = ConfigBuilderPlugin.getPlugin().getActiveProfileInterface().getProfile();
         if (profileSpinner == null || profileSpinner.getSelectedItem() == null || profileStore == null)
             return; // not initialized yet
-        String selectedAlternativeProfile = profileSpinner.getSelectedItem().toString();
+        String profileName = profileSpinner.getSelectedItem().toString();
         Profile specificProfile;
-        if (selectedAlternativeProfile.equals(MainApp.gs(R.string.active))) {
+        if (profileName.equals(MainApp.gs(R.string.active))) {
             specificProfile = ProfileFunctions.getInstance().getProfile();
-            selectedAlternativeProfile = ProfileFunctions.getInstance().getProfileName();
+            profileName = ProfileFunctions.getInstance().getProfileName();
         } else
-            specificProfile = profileStore.getSpecificProfile(selectedAlternativeProfile);
+            specificProfile = profileStore.getSpecificProfile(profileName);
 
         // Entered values
         Double c_bg = SafeParse.stringToDouble(editBg.getText());
@@ -494,104 +388,61 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
         Double c_cob = 0d;
         if (cobCheckbox.isChecked()) {
             CobInfo cobInfo = IobCobCalculatorPlugin.getPlugin().getCobInfo(false, "Wizard COB");
-            if (cobInfo != null && cobInfo.displayCob != null)
+            if (cobInfo.displayCob != null)
                 c_cob = cobInfo.displayCob;
         }
 
-        BolusWizard wizard = new BolusWizard();
+        wizard = new BolusWizard(specificProfile, profileName, tempTarget, carbsAfterConstraint, c_cob, c_bg, corrAfterConstraint, 100d, bgCheckbox.isChecked(), cobCheckbox.isChecked(), bolusIobCheckbox.isChecked(), basalIobCheckbox.isChecked(), superbolusCheckbox.isChecked(), ttCheckbox.isChecked(), bgtrendCheckbox.isChecked(), notesEdit.getText().toString(), SafeParse.stringToInt(editCarbTime.getText()));
-        wizard.doCalc(specificProfile, tempTarget, carbsAfterConstraint, c_cob, c_bg, corrAfterConstraint, bolusIobCheckbox.isChecked(), basalIobCheckbox.isChecked(), superbolusCheckbox.isChecked(), bgtrendCheckbox.isChecked());
 
-        bg.setText(c_bg + " ISF: " + DecimalFormatter.to1Decimal(wizard.sens));
+        bg.setText(c_bg + " ISF: " + DecimalFormatter.to1Decimal(wizard.getSens()));
-        bgInsulin.setText(DecimalFormatter.to2Decimal(wizard.insulinFromBG) + "U");
+        bgInsulin.setText(StringUtils.formatInsulin(wizard.getInsulinFromBG()));
 
-        carbs.setText(DecimalFormatter.to0Decimal(c_carbs) + "g IC: " + DecimalFormatter.to1Decimal(wizard.ic));
+        carbs.setText(DecimalFormatter.to0Decimal(c_carbs) + "g IC: " + DecimalFormatter.to1Decimal(wizard.getIc()));
-        carbsInsulin.setText(DecimalFormatter.to2Decimal(wizard.insulinFromCarbs) + "U");
+        carbsInsulin.setText(StringUtils.formatInsulin(wizard.getInsulinFromCarbs()));
 
-        bolusIobInsulin.setText(DecimalFormatter.to2Decimal(wizard.insulingFromBolusIOB) + "U");
+        bolusIobInsulin.setText(StringUtils.formatInsulin(wizard.getInsulinFromBolusIOB()));
-        basalIobInsulin.setText(DecimalFormatter.to2Decimal(wizard.insulingFromBasalsIOB) + "U");
+        basalIobInsulin.setText(StringUtils.formatInsulin(wizard.getInsulinFromBasalsIOB()));
 
-        correctionInsulin.setText(DecimalFormatter.to2Decimal(wizard.insulinFromCorrection) + "U");
+        correctionInsulin.setText(StringUtils.formatInsulin(wizard.getInsulinFromCorrection()));
-        calculatedTotalInsulin = wizard.calculatedTotalInsulin;
 
         calculatedCarbs = carbsAfterConstraint;
 
         // Superbolus
-        if (superbolusCheckbox.isChecked()) {
+        superbolus.setText(superbolusCheckbox.isChecked() ? MainApp.gs(R.string.twohours) : "");
-            superbolus.setText("2h");
+        superbolusInsulin.setText(StringUtils.formatInsulin(wizard.getInsulinFromSuperBolus()));
-        } else {
-            superbolus.setText("");
-        }
-        superbolusInsulin.setText(DecimalFormatter.to2Decimal(wizard.insulinFromSuperBolus) + "U");
 
         // Trend
-        if (bgtrendCheckbox.isChecked()) {
+        if (bgtrendCheckbox.isChecked() && wizard.getGlucoseStatus() != null) {
-            if (wizard.glucoseStatus != null) {
+            bgTrend.setText(
-                bgTrend.setText((wizard.glucoseStatus.avgdelta > 0 ? "+" : "") + Profile.toUnitsString(wizard.glucoseStatus.avgdelta * 3, wizard.glucoseStatus.avgdelta * 3 / 18, specificProfile.getUnits()) + " " + specificProfile.getUnits());
+                    (wizard.getTrend() > 0 ? "+" : "")
+                            + Profile.toUnitsString(wizard.getTrend() * 3, wizard.getTrend() * 3 / Constants.MMOLL_TO_MGDL, specificProfile.getUnits())
+                            + " " + specificProfile.getUnits());
         } else {
             bgTrend.setText("");
         }
-        } else {
+        bgTrendInsulin.setText(StringUtils.formatInsulin(wizard.getInsulinFromTrend()));
-            bgTrend.setText("");
-        }
-        bgTrendInsulin.setText(DecimalFormatter.to2Decimal(wizard.insulinFromTrend) + "U");
 
         // COB
         if (cobCheckbox.isChecked()) {
-            cob.setText(DecimalFormatter.to2Decimal(c_cob) + "g IC: " + DecimalFormatter.to1Decimal(wizard.ic));
+            cob.setText(DecimalFormatter.to2Decimal(c_cob) + "g IC: " + DecimalFormatter.to1Decimal(wizard.getIc()));
-            cobInsulin.setText(DecimalFormatter.to2Decimal(wizard.insulinFromCOB) + "U");
+            cobInsulin.setText(StringUtils.formatInsulin(wizard.getInsulinFromCOB()));
         } else {
             cob.setText("");
             cobInsulin.setText("");
         }
 
-        if (calculatedTotalInsulin > 0d || calculatedCarbs > 0d) {
+        if (wizard.getCalculatedTotalInsulin() > 0d || calculatedCarbs > 0d) {
-            String insulinText = calculatedTotalInsulin > 0d ? (DecimalFormatter.toPumpSupportedBolus(calculatedTotalInsulin) + "U") : "";
+            String insulinText = wizard.getCalculatedTotalInsulin() > 0d ? (DecimalFormatter.toPumpSupportedBolus(wizard.getCalculatedTotalInsulin()) + "U") : "";
             String carbsText = calculatedCarbs > 0d ? (DecimalFormatter.to0Decimal(calculatedCarbs) + "g") : "";
             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(MainApp.gs(R.string.missing) + " " + DecimalFormatter.to0Decimal(wizard.carbsEquivalent) + "g");
+            total.setText(MainApp.gs(R.string.missing) + " " + DecimalFormatter.to0Decimal(wizard.getCarbsEquivalent()) + "g");
             okButton.setVisibility(View.INVISIBLE);
         }
 
-        boluscalcJSON = new JSONObject();
-        try {
-            boluscalcJSON.put("profile", selectedAlternativeProfile);
-            boluscalcJSON.put("notes", notesEdit.getText());
-            boluscalcJSON.put("eventTime", DateUtil.toISOString(new Date()));
-            boluscalcJSON.put("targetBGLow", wizard.targetBGLow);
-            boluscalcJSON.put("targetBGHigh", wizard.targetBGHigh);
-            boluscalcJSON.put("isf", wizard.sens);
-            boluscalcJSON.put("ic", wizard.ic);
-            boluscalcJSON.put("iob", -(wizard.insulingFromBolusIOB + wizard.insulingFromBasalsIOB));
-            boluscalcJSON.put("bolusiob", wizard.insulingFromBolusIOB);
-            boluscalcJSON.put("basaliob", wizard.insulingFromBasalsIOB);
-            boluscalcJSON.put("bolusiobused", bolusIobCheckbox.isChecked());
-            boluscalcJSON.put("basaliobused", basalIobCheckbox.isChecked());
-            boluscalcJSON.put("bg", c_bg);
-            boluscalcJSON.put("insulinbg", wizard.insulinFromBG);
-            boluscalcJSON.put("insulinbgused", bgCheckbox.isChecked());
-            boluscalcJSON.put("bgdiff", wizard.bgDiff);
-            boluscalcJSON.put("insulincarbs", wizard.insulinFromCarbs);
-            boluscalcJSON.put("carbs", c_carbs);
-            boluscalcJSON.put("cob", c_cob);
-            boluscalcJSON.put("cobused", cobCheckbox.isChecked());
-            boluscalcJSON.put("insulincob", wizard.insulinFromCOB);
-            boluscalcJSON.put("othercorrection", corrAfterConstraint);
-            boluscalcJSON.put("insulinsuperbolus", wizard.insulinFromSuperBolus);
-            boluscalcJSON.put("insulintrend", wizard.insulinFromTrend);
-            boluscalcJSON.put("insulin", calculatedTotalInsulin);
-            boluscalcJSON.put("superbolusused", superbolusCheckbox.isChecked());
-            boluscalcJSON.put("insulinsuperbolus", wizard.insulinFromSuperBolus);
-            boluscalcJSON.put("trendused", bgtrendCheckbox.isChecked());
-            boluscalcJSON.put("insulintrend", wizard.insulinFromTrend);
-            boluscalcJSON.put("trend", bgTrend.getText());
-            boluscalcJSON.put("ttused", ttCheckbox.isChecked());
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
     }
 
 }

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

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.overview.notifications;
 import android.app.IntentService;
 import android.app.PendingIntent;
 import android.content.Intent;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationRecyclerViewAdapter.java

@@ -1,8 +1,8 @@
 package info.nightscout.androidaps.plugins.general.overview.notifications;
 
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
-import android.support.v7.widget.CardView;
+import androidx.cardview.widget.CardView;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

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

@@ -11,7 +11,9 @@ import android.media.AudioAttributes;
 import android.media.RingtoneManager;
 import android.net.Uri;
 import android.os.Build;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
+import androidx.recyclerview.widget.RecyclerView;
+import android.view.View;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -21,7 +23,6 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.logging.L;
@@ -68,6 +69,9 @@ public class NotificationStore {
             if (usesChannels && n.soundId != null) {
                 Intent alarm = new Intent(MainApp.instance().getApplicationContext(), AlarmSoundService.class);
                 alarm.putExtra("soundid", n.soundId);
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+                    MainApp.instance().startForegroundService(alarm);
+                else
                     MainApp.instance().startService(alarm);
             }
 
@@ -75,6 +79,9 @@ public class NotificationStore {
             if (n.soundId != null) {
                 Intent alarm = new Intent(MainApp.instance().getApplicationContext(), AlarmSoundService.class);
                 alarm.putExtra("soundid", n.soundId);
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+                    MainApp.instance().startForegroundService(alarm);
+                else
                     MainApp.instance().startService(alarm);
             }
         }
@@ -97,7 +104,7 @@ public class NotificationStore {
         return false;
     }
 
-    public synchronized void removeExpired() {
+    private synchronized void removeExpired() {
         for (int i = 0; i < store.size(); i++) {
             Notification n = store.get(i);
             if (n.validTo.getTime() != 0 && n.validTo.getTime() < System.currentTimeMillis()) {
@@ -107,13 +114,13 @@ public class NotificationStore {
         }
     }
 
-    public void snoozeTo(long timeToSnooze) {
+    void snoozeTo(long timeToSnooze) {
         if (L.isEnabled(L.NOTIFICATION))
             log.debug("Snoozing alarm until: " + timeToSnooze);
         SP.putLong("snoozedTo", timeToSnooze);
     }
 
-    public void unSnooze() {
+    private void unSnooze() {
         if (Notification.isAlarmForStaleData()) {
             Notification notification = new Notification(Notification.NSALARM, MainApp.gs(R.string.nsalarm_staledata), Notification.URGENT);
             SP.putLong("snoozedTo", System.currentTimeMillis());
@@ -160,4 +167,16 @@ public class NotificationStore {
         }
     }
 
+    public synchronized void updateNotifications(RecyclerView notificationsView) {
+        removeExpired();
+        unSnooze();
+        if (store.size() > 0) {
+            NotificationRecyclerViewAdapter adapter = new NotificationRecyclerViewAdapter(store);
+            notificationsView.setAdapter(adapter);
+            notificationsView.setVisibility(View.VISIBLE);
+        } else {
+            notificationsView.setVisibility(View.GONE);
+        }
+    }
+
 }

app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.java

@@ -4,7 +4,8 @@ import android.app.Notification;
 import android.app.Service;
 import android.content.Intent;
 import android.os.IBinder;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.Nullable;
 
 import com.squareup.otto.Subscribe;
 
@@ -29,9 +30,8 @@ public class DummyService extends Service {
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        Notification notification = PersistentNotificationPlugin.getPlugin().updateNotification();
+        super.onStartCommand(intent, flags, startId);
-        if (notification != null)
+        startForeground(PersistentNotificationPlugin.ONGOING_NOTIFICATION_ID, PersistentNotificationPlugin.getPlugin().updateNotification());
-            startForeground(PersistentNotificationPlugin.ONGOING_NOTIFICATION_ID, notification);
         return START_STICKY;
     }
 
@@ -45,6 +45,11 @@ public class DummyService extends Service {
 
     @Override
     public void onCreate() {
+        super.onCreate();
+        // TODO: I guess this was moved here in order to adhere to the 5 seconds rule to call "startForeground" after a Service was called as Foreground service?
+        // As onCreate() is not called every time a service is started, copied to onStartCommand().
+        Notification notification = PersistentNotificationPlugin.getPlugin().updateNotification();
+        startForeground(PersistentNotificationPlugin.ONGOING_NOTIFICATION_ID, notification);
         MainApp.bus().register(this);
     }
 

app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.java

@@ -10,17 +10,19 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Build;
-import android.support.v4.app.NotificationCompat;
+
-import android.support.v4.app.RemoteInput;
+import androidx.core.app.NotificationCompat;
-import android.support.v4.app.TaskStackBuilder;
+import androidx.core.app.RemoteInput;
+import androidx.core.app.TaskStackBuilder;
 
 import com.squareup.otto.Subscribe;
 
+import javax.annotation.Nonnull;
+
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainActivity;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
 import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.db.DatabaseHelper;
@@ -37,6 +39,7 @@ import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
@@ -49,6 +52,7 @@ import info.nightscout.androidaps.utils.DecimalFormatter;
 public class PersistentNotificationPlugin extends PluginBase {
 
     private static PersistentNotificationPlugin plugin;
+    private Notification notification;
 
     public static PersistentNotificationPlugin getPlugin() {
         if (plugin == null) plugin = new PersistentNotificationPlugin(MainApp.instance());
@@ -72,13 +76,14 @@ public class PersistentNotificationPlugin extends PluginBase {
     /// End Android Auto
 
 
-    public PersistentNotificationPlugin(Context ctx) {
+    private PersistentNotificationPlugin(Context ctx) {
         super(new PluginDescription()
                 .mainType(PluginType.GENERAL)
                 .neverVisible(true)
                 .pluginName(R.string.ongoingnotificaction)
                 .enableByDefault(true)
-                .alwaysEnabled(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+                .alwaysEnabled(true)
+                .showInList(false)
                 .description(R.string.description_persistent_notification)
         );
         this.ctx = ctx;
@@ -86,8 +91,8 @@ public class PersistentNotificationPlugin extends PluginBase {
 
     @Override
     protected void onStart() {
+        createNotificationChannel(); // make sure channels exist before triggering updates through the bus
         MainApp.bus().register(this);
-        createNotificationChannel();
         triggerNotificationUpdate();
         super.onStart();
     }
@@ -111,19 +116,21 @@ public class PersistentNotificationPlugin extends PluginBase {
     }
 
     private void triggerNotificationUpdate() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+            MainApp.instance().startForegroundService(new Intent(MainApp.instance(), DummyService.class));
+        else
             MainApp.instance().startService(new Intent(MainApp.instance(), DummyService.class));
     }
 
+    @Nonnull
     Notification updateNotification() {
-        if (!isEnabled(PluginType.GENERAL)) {
+        String line1 = null;
-            return null;
+        String line2 = null;
-        }
+        String line3 = null;
+        NotificationCompat.CarExtender.UnreadConversation.Builder unreadConversationBuilder = null;
 
-        String line1;
+        if (ConfigBuilderPlugin.getPlugin().getActiveProfileInterface() != null && ProfileFunctions.getInstance().isProfileValid("Notification")) {
             String line1_aa;
-
-        if (ConfigBuilderPlugin.getPlugin().getActiveProfileInterface() == null || !ProfileFunctions.getInstance().isProfileValid("Notificiation"))
-            return null;
             String units = ProfileFunctions.getInstance().getProfileUnits();
 
 
@@ -159,11 +166,11 @@ public class PersistentNotificationPlugin extends PluginBase {
             IobTotal basalIob = TreatmentsPlugin.getPlugin().getLastCalculationTempBasals().round();
 
 
-        String line2 = MainApp.gs(R.string.treatments_iob_label_string) + " " + DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U " + MainApp.gs(R.string.cob) + ": " + IobCobCalculatorPlugin.getPlugin().getCobInfo(false, "PersistentNotificationPlugin").generateCOBString();
+            line2 = MainApp.gs(R.string.treatments_iob_label_string) + " " + DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U " + MainApp.gs(R.string.cob) + ": " + IobCobCalculatorPlugin.getPlugin().getCobInfo(false, "PersistentNotificationPlugin").generateCOBString();
             String line2_aa = MainApp.gs(R.string.treatments_iob_label_string) + " " + DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U. " + MainApp.gs(R.string.cob) + ": " + IobCobCalculatorPlugin.getPlugin().getCobInfo(false, "PersistentNotificationPlugin").generateCOBString() + ".";
 
 
-        String line3 = DecimalFormatter.to2Decimal(ConfigBuilderPlugin.getPlugin().getActivePump().getBaseBasalRate()) + " U/h";
+            line3 = DecimalFormatter.to2Decimal(ConfigBuilderPlugin.getPlugin().getActivePump().getBaseBasalRate()) + " U/h";
             String line3_aa = DecimalFormatter.to2Decimal(ConfigBuilderPlugin.getPlugin().getActivePump().getBaseBasalRate()) + " U/h.";
 
 
@@ -199,7 +206,7 @@ public class PersistentNotificationPlugin extends PluginBase {
             RemoteInput remoteInput = new RemoteInput.Builder(EXTRA_VOICE_REPLY).build();
 
             // Create the UnreadConversation
-        NotificationCompat.CarExtender.UnreadConversation.Builder unreadConversationBuilder =
+            unreadConversationBuilder =
                     new NotificationCompat.CarExtender.UnreadConversation.Builder(line1_aa + "\n" + line2_aa)
                             .setLatestTimestamp(System.currentTimeMillis())
                             .setReadPendingIntent(msgReadPendingIntent)
@@ -208,7 +215,7 @@ public class PersistentNotificationPlugin extends PluginBase {
             /// Add dot to produce a "more natural sounding result"
             unreadConversationBuilder.addMessage(line3_aa);
             /// End Android Auto
-
+        }
 
         NotificationCompat.Builder builder = new NotificationCompat.Builder(ctx, CHANNEL_ID);
         builder.setOngoing(true);
@@ -217,12 +224,14 @@ public class PersistentNotificationPlugin extends PluginBase {
         builder.setSmallIcon(MainApp.getNotificationIcon());
         Bitmap largeIcon = BitmapFactory.decodeResource(ctx.getResources(), MainApp.getIcon());
         builder.setLargeIcon(largeIcon);
-        builder.setContentTitle(line1);
+        builder.setContentTitle(line1 != null ? line1 : MainApp.gs(R.string.noprofileset));
-        builder.setContentText(line2);
+        builder.setContentText(line2 != null ? line2 : MainApp.gs(R.string.noprofileset));
-        builder.setSubText(line3);
+        builder.setSubText(line3 != null ? line3 : MainApp.gs(R.string.noprofileset));
         /// Android Auto
+        if (unreadConversationBuilder != null) {
             builder.extend(new NotificationCompat.CarExtender()
                     .setUnreadConversation(unreadConversationBuilder.build()));
+        }
         /// End Android Auto
 
 
@@ -242,6 +251,7 @@ public class PersistentNotificationPlugin extends PluginBase {
 
         android.app.Notification notification = builder.build();
         mNotificationManager.notify(ONGOING_NOTIFICATION_ID, notification);
+        this.notification = notification;
         return notification;
     }
 
@@ -261,6 +271,17 @@ public class PersistentNotificationPlugin extends PluginBase {
         return deltastring;
     }
 
+    /***
+     * returns the current ongoing notification.
+     *
+     * If it does not exist, return a dummy notification. This should only happen if onStart() wasn't called.
+     */
+
+    public Notification getLastNotification() {
+        if (notification != null) return  notification;
+        else return new Notification();
+    }
+
 
     @Subscribe
     public void onStatusEvent(final EventPreferenceChange ev) {

app/src/main/java/info/nightscout/androidaps/plugins/general/versionChecker/VersionCheckerUtils.kt

@@ -9,29 +9,21 @@ import info.nightscout.androidaps.logging.L
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.utils.SP
-import org.apache.http.HttpResponse
-import org.apache.http.client.methods.HttpGet
-import org.apache.http.impl.client.DefaultHttpClient
 import org.slf4j.LoggerFactory
 import java.io.IOException
-import java.io.InputStream
+import java.net.URL
 import java.util.concurrent.TimeUnit
 
+
 // check network connection
 fun isConnected(): Boolean {
     val connMgr = MainApp.instance().applicationContext.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
     return connMgr.activeNetworkInfo?.isConnected ?: false
 }
 
-// convert inputstream to String
+fun findVersion(file :String?): String? {
-@Throws(IOException::class)
-inline fun InputStream.findVersion(): String? {
     val regex = "(.*)version(.*)\"(((\\d+)\\.)+(\\d+))\"(.*)".toRegex()
-    return bufferedReader()
+    return file?.lines()?.filter { regex.matches(it) }?.mapNotNull { regex.matchEntire(it)?.groupValues?.getOrNull(3) }?.firstOrNull()
-            .readLines()
-            .filter { regex.matches(it) }
-            .mapNotNull { regex.matchEntire(it)?.groupValues?.getOrNull(3) }
-            .firstOrNull()
 }
 
 private val log = LoggerFactory.getLogger(L.CORE)
@@ -50,13 +42,10 @@ fun triggerCheckVersion() {
     }
 }
 
-@Suppress("DEPRECATION")
 private fun checkVersion() = if (isConnected()) {
     Thread {
         try {
-            val request = HttpGet("https://raw.githubusercontent.com/MilosKozak/AndroidAPS/master/app/build.gradle")
+            val version: String? = findVersion(URL("https://raw.githubusercontent.com/MilosKozak/AndroidAPS/master/app/build.gradle").readText())
-            val response: HttpResponse = DefaultHttpClient().execute(request)
-            val version: String? = response.entity.content?.findVersion()
             compareWithCurrentVersion(version, BuildConfig.VERSION_NAME)
         } catch (e: IOException) {
             log.debug("Github master version check error: $e")

app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.wear;
 import android.app.NotificationManager;
 import android.content.Context;
 import android.os.HandlerThread;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.text.DateFormat;
 import java.text.DecimalFormat;
@@ -207,6 +207,7 @@ public class ActionStringHandler {
             int percentage = Integer.parseInt(act[2]);
 
             Profile profile = ProfileFunctions.getInstance().getProfile();
+            String profileName = ProfileFunctions.getInstance().getProfileName();
             if (profile == null) {
                 sendError("No profile found!");
                 return;
@@ -226,45 +227,38 @@ public class ActionStringHandler {
 
             DecimalFormat format = new DecimalFormat("0.00");
             DecimalFormat formatInt = new DecimalFormat("0");
-            BolusWizard bolusWizard = new BolusWizard();
+            BolusWizard bolusWizard = new BolusWizard(profile, profileName, TreatmentsPlugin.getPlugin().getTempTargetFromHistory(),
-            bolusWizard.doCalc(profile, useTT ? TreatmentsPlugin.getPlugin().getTempTargetFromHistory() : null,
+                    carbsAfterConstraints, cobInfo.displayCob, bgReading.valueToUnits(profile.getUnits()),
-                    carbsAfterConstraints, useCOB?cobInfo.displayCob:0d, useBG ? bgReading.valueToUnits(profile.getUnits()) : 0d,
+                    0d, percentage, useBG, useCOB, useBolusIOB, useBasalIOB, false, useTT, useTrend);
-                    0d, percentage, useBolusIOB, useBasalIOB, false, useTrend);
 
-            Double insulinAfterConstraints = MainApp.getConstraintChecker().applyBolusConstraints(new Constraint<>(bolusWizard.calculatedTotalInsulin)).value();
+            if (Math.abs(bolusWizard.getInsulinAfterConstraints() - bolusWizard.getCalculatedTotalInsulin()) >= 0.01) {
-            if (Math.abs(insulinAfterConstraints - bolusWizard.calculatedTotalInsulin) >= 0.01) {
                 sendError("Insulin constraint violation!" +
-                        "\nCannot deliver " + format.format(bolusWizard.calculatedTotalInsulin) + "!");
+                        "\nCannot deliver " + format.format(bolusWizard.getCalculatedTotalInsulin()) + "!");
                 return;
             }
 
-
+            if (bolusWizard.getCalculatedTotalInsulin() <= 0 && bolusWizard.getCarbs() <= 0) {
-            if (bolusWizard.calculatedTotalInsulin < 0) {
-                bolusWizard.calculatedTotalInsulin = 0d;
-            }
-
-            if (bolusWizard.calculatedTotalInsulin <= 0 && bolusWizard.carbs <= 0) {
                 rAction = "info";
                 rTitle = "INFO";
             } else {
                 rAction = actionstring;
             }
-            rMessage += "Carbs: " + bolusWizard.carbs + "g";
+            rMessage += "Carbs: " + bolusWizard.getCarbs() + "g";
-            rMessage += "\nBolus: " + format.format(bolusWizard.calculatedTotalInsulin) + "U";
+            rMessage += "\nBolus: " + format.format(bolusWizard.getCalculatedTotalInsulin()) + "U";
             rMessage += "\n_____________";
-            rMessage += "\nCalc (IC:" + DecimalFormatter.to1Decimal(bolusWizard.ic) + ", " + "ISF:" + DecimalFormatter.to1Decimal(bolusWizard.sens) + "): ";
+            rMessage += "\nCalc (IC:" + DecimalFormatter.to1Decimal(bolusWizard.getIc()) + ", " + "ISF:" + DecimalFormatter.to1Decimal(bolusWizard.getSens()) + "): ";
-            rMessage += "\nFrom Carbs: " + format.format(bolusWizard.insulinFromCarbs) + "U";
+            rMessage += "\nFrom Carbs: " + format.format(bolusWizard.getInsulinFromCarbs()) + "U";
             if (useCOB)
-                rMessage += "\nFrom" + formatInt.format(cobInfo.displayCob) + "g COB : " + format.format(bolusWizard.insulinFromCOB) + "U";
+                rMessage += "\nFrom" + formatInt.format(cobInfo.displayCob) + "g COB : " + format.format(bolusWizard.getInsulinFromCOB()) + "U";
-            if (useBG) rMessage += "\nFrom BG: " + format.format(bolusWizard.insulinFromBG) + "U";
+            if (useBG) rMessage += "\nFrom BG: " + format.format(bolusWizard.getInsulinFromBG()) + "U";
             if (useBolusIOB)
-                rMessage += "\nBolus IOB: " + format.format(bolusWizard.insulingFromBolusIOB) + "U";
+                rMessage += "\nBolus IOB: " + format.format(bolusWizard.getInsulinFromBolusIOB()) + "U";
             if (useBasalIOB)
-                rMessage += "\nBasal IOB: " + format.format(bolusWizard.insulingFromBasalsIOB) + "U";
+                rMessage += "\nBasal IOB: " + format.format(bolusWizard.getInsulinFromBasalsIOB()) + "U";
             if (useTrend)
-                rMessage += "\nFrom 15' trend: " + format.format(bolusWizard.insulinFromTrend) + "U";
+                rMessage += "\nFrom 15' trend: " + format.format(bolusWizard.getInsulinFromTrend()) + "U";
             if (percentage != 100) {
-                rMessage += "\nPercentage: " + format.format(bolusWizard.totalBeforePercentageAdjustment) + "U * " + percentage + "% -> ~" + format.format(bolusWizard.calculatedTotalInsulin) + "U";
+                rMessage += "\nPercentage: " + format.format(bolusWizard.getTotalBeforePercentageAdjustment()) + "U * " + percentage + "% -> ~" + format.format(bolusWizard.getCalculatedTotalInsulin()) + "U";
             }
 
             lastBolusWizard = bolusWizard;
@@ -628,7 +622,7 @@ public class ActionStringHandler {
             if (lastBolusWizard != null) {
                 //use last calculation as confirmed string matches
 
-                doBolus(lastBolusWizard.calculatedTotalInsulin, lastBolusWizard.carbs);
+                doBolus(lastBolusWizard.getCalculatedTotalInsulin(), lastBolusWizard.getCarbs());
                 lastBolusWizard = null;
             }
         } else if ("bolus".equals(act[0])) {

app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearFragment.java

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.general.wear;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

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

@@ -17,7 +17,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
 import com.google.android.gms.common.ConnectionResult;

app/src/main/java/info/nightscout/androidaps/plugins/general/xdripStatusline/StatuslinePlugin.java

@@ -5,7 +5,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.squareup.otto.Subscribe;
 

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

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.insulin;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/CobInfo.java

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.iob.iobCobCalculator;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import info.nightscout.androidaps.utils.DecimalFormatter;
 

app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/GlucoseStatus.java

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.iob.iobCobCalculator;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java

@@ -1,9 +1,9 @@
 package info.nightscout.androidaps.plugins.iob.iobCobCalculator;
 
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.util.LongSparseArray;
+import androidx.collection.LongSparseArray;
 
 import com.squareup.otto.Subscribe;
 
@@ -391,6 +391,7 @@ public class IobCobCalculatorPlugin extends PluginBase {
     }
 
     public BasalData getBasalData(Profile profile, long time) {
+        synchronized (dataLock) {
             long now = System.currentTimeMillis();
             time = roundUpTime(time);
             BasalData retval = basalDataTable.get(time);
@@ -414,6 +415,7 @@ public class IobCobCalculatorPlugin extends PluginBase {
             }
             return retval;
         }
+    }
 
     @Nullable
     public AutosensData getAutosensData(long time) {

app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.iob.iobCobCalculator;
 import android.content.Context;
 import android.os.PowerManager;
 import android.os.SystemClock;
-import android.support.v4.util.LongSparseArray;
+import androidx.collection.LongSparseArray;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.iob.iobCobCalculator;
 import android.content.Context;
 import android.os.PowerManager;
 import android.os.SystemClock;
-import android.support.v4.util.LongSparseArray;
+import androidx.collection.LongSparseArray;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.java

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.profile.local;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.LayoutInflater;

app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.java

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.profile.local;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.json.JSONArray;
 import org.json.JSONException;

app/src/main/java/info/nightscout/androidaps/plugins/profile/ns/NSProfilePlugin.java

@@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.profile.ns;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.json.JSONException;
 import org.json.JSONObject;

app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java

@@ -5,7 +5,7 @@ import android.app.Activity;
 import android.graphics.Color;
 import android.graphics.Typeface;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java

@@ -2,10 +2,10 @@ package info.nightscout.androidaps.plugins.pump.combo;
 
 import android.content.DialogInterface;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 
 import org.json.JSONObject;
 import org.slf4j.Logger;

app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPump.java

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.combo;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/CommandResult.java

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.util.LinkedList;
 import java.util.List;

app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/RuffyScripter.java

@@ -7,8 +7,8 @@ import android.content.ServiceConnection;
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.google.common.base.Joiner;
 

app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/WarningOrErrorCode.java

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 public class WarningOrErrorCode {
     @Nullable

app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/BaseCommand.java

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.monkey.d.ruffy.ruffy.driver.display.MenuAttribute;
 import org.monkey.d.ruffy.ruffy.driver.display.MenuType;

app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadHistoryCommand.java

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.commands;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.monkey.d.ruffy.ruffy.driver.display.MenuAttribute;
 import org.monkey.d.ruffy.ruffy.driver.display.MenuType;